diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 11:35:13 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 11:35:13 +0100 |
| commit | 32bd12dba91a11dc91beea828246389622964348 (patch) | |
| tree | c411d73b6c5ed46cc9835f79865029cc3ba5cdfc /.gitignore | |
| parent | 797f19a0361dfda979e3535f8dc904d11df902aa (diff) | |
| parent | fe0e2d65e190b816959c624149a6dc48b7118796 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
.gitignore
common
configure.ac
ext/vorbis/gstvorbisdeclib.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/riff/riff-read.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkconvertbin.c
tests/check/libs/video.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4378578c5..98a665aab 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,7 @@ Makefile /gst-libs/gst/audio/audio-marshal.[ch] /gst-libs/gst/video/video-marshal.[ch] +/tests/examples/playback/playback-test tmp-orc.c gst*orc.h |