Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 14:44:15 +0000 (15:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 14:44:15 +0000 (15:44 +0100)
commit0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04
tree041202962161e4fb791cbd9f8ddb98cf90fc9613
parenta75f01d7e0bf166a0b443eb15621753619bb8d88
parent7b89cd20d844cbe763ca34e63e99d110043cf241
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>
libavcodec/012v.c
libavcodec/eamad.c
libavcodec/h264.c
libavcodec/svq1enc.c
libavfilter/af_volume.c
libavformat/idcin.c
libavutil/frame.c
libswscale/swscale_unscaled.c