ffmpeg/libavutil
Michael Niedermayer 0cfbfaaa12 Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:44:15 +01:00
..
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-07-16 19:30:13 +00:00
2012-04-20 09:43:11 -04:00
2012-12-05 20:25:32 +01:00
2013-03-07 01:12:04 +01:00
2013-03-07 01:12:04 +01:00
2012-10-31 17:01:52 +01:00
2013-01-24 00:49:47 +01:00
2013-01-24 00:49:47 +01:00
2012-08-09 01:44:15 +02:00
2012-10-28 14:33:41 +01:00
2013-03-10 11:12:56 +01:00
2013-03-05 13:20:14 +01:00
2012-12-08 01:34:28 +01:00
2012-10-06 14:03:15 +02:00
2012-11-23 18:10:02 +01:00
2012-10-28 14:33:41 +01:00
2012-10-31 03:10:35 +01:00
2012-10-28 14:33:41 +01:00
2013-01-05 16:25:37 +01:00