projects / platform / upstream / gst-libav.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3008de6 82ac8b1)
Merge branch 'master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 15 Jul 2011 10:34:19 +0000 (12:34 +0200)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 15 Jul 2011 10:34:19 +0000 (12:34 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
ext/ffmpeg/gstffmpegdec.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc ext/ffmpeg/gstffmpegdec.c
Simple merge
Domain: Multimedia / Codec;