Michael Niedermayer 39de8343f9 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>

2012-04-30 22:18:43 +02:00

83 KiB

Raw Blame History

View Raw