1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
FFmpeg/libavcodec
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
..
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-27 19:39:19 +02:00
2012-04-21 19:28:35 +02:00
2012-04-17 19:36:15 +02:00
2012-04-16 16:27:34 +02:00
2012-04-18 16:49:46 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-15 16:06:51 +02:00
2012-04-30 18:31:07 +02:00
2012-04-22 17:27:54 +02:00
2012-04-23 21:59:34 +02:00
2012-04-15 13:26:19 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-16 16:46:53 +02:00
2012-04-15 18:21:53 +02:00
2012-04-27 19:39:19 +02:00
2012-04-27 19:39:19 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-15 01:08:13 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-12 11:36:17 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-16 18:36:40 +02:00
2012-04-15 20:20:43 +02:00
2012-04-21 18:56:19 +01:00
2012-04-15 16:06:52 +02:00