[FFmpeg-cvslog] Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 15:44:15 2013 +0100| [0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04
---