1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
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-16 15:27:39 +02:00
2012-04-19 22:52:34 +02:00
2012-04-28 16:39:54 +02:00
2012-03-03 04:30:49 +01:00
2011-12-30 20:00:53 +01:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-04-30 03:49:32 +02:00
2012-03-31 12:37:42 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-04-06 00:53:09 +02:00
2012-04-29 13:03:15 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-04-04 20:39:33 +02:00
2012-02-28 07:20:36 +01:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-04-03 19:12:52 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00