Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Apr 2012 20:05:03 +0000 (22:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Apr 2012 20:18:43 +0000 (22:18 +0200)
commit39de8343f9274f3c93bf44ecb7dcd832b648365d
treeedea96a08f325f56b762b7f6ea103d16b2d8cd95
parent79e5902cf163dcb8b6539618936ff0ce28f742e4
parent0ca4642ec520e315692c4a8b8a98ab390bddfad2
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>
libavcodec/avcodec.h
libavcodec/sbr.h
libavformat/matroskadec.c