FFmpeg/libavcodec
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
..
2013-02-21 23:06:30 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-01-21 10:24:45 +00:00
2013-03-06 22:11:46 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-09 01:08:39 +01:00
2013-01-21 10:24:45 +00:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 10:31:56 +00:00
2013-03-02 20:39:38 +01:00
2012-12-31 00:41:35 +01:00
2013-01-23 19:39:42 +01:00
2013-01-23 19:39:42 +01:00
2013-03-05 03:29:04 +01:00
2013-03-12 12:17:58 +01:00
2013-01-24 01:47:20 +01:00
2013-01-06 16:30:02 +01:00
2013-02-03 13:08:36 +01:00
2013-03-06 22:11:46 +01:00
2013-01-12 14:06:30 +01:00
2013-02-09 14:22:29 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-03-12 10:35:51 +01:00
2013-01-06 16:30:02 +01:00
2013-03-06 22:11:46 +01:00