ffmpeg | branch: master | Michael Niedermayer <michaelni@gmx.at> | Mon Apr 30 22:05:03 2012 +0200| [39de8343f9274f3c93bf44ecb7dcd832b648365d] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: mkv: mark corrupted packets and return them mkv: forward EMBL block data error avcodec: introduce YCoCg colorspace avcodec: cosmetic cleanup on header aac sbr: align struct member by 32 byte. Conflicts: libavcodec/avcodec.h libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39de8343f9274f3c93...