projects / platform / upstream / gst-libav.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 112231d 6444bd2)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 10:38:01 +0000 (12:38 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 10:38:01 +0000 (12:38 +0200)
Conflicts:
ext/ffmpeg/gstffmpegdec.c


Trivial merge
Domain: Multimedia / Codec;