Merge remote-tracking branch 'origin/0.10'
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 Apr 2012 14:23:41 +0000 (16:23 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 Apr 2012 14:23:41 +0000 (16:23 +0200)
commitcd2e53aa9ff5fb9df7d9c3af5e197e511973e007
tree7b06ac77149d85f880a564c28aa8f99be65d0fdc
parent2e3dd525c8c4a8b8db9b66f9204760b5c3854a48
parent630790f50d04a4998a37a0e01304e9196f776476
Merge remote-tracking branch 'origin/0.10'
ext/ffmpeg/gstffmpegdec.c