[FFmpeg-cvslog] Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 15:36:37 2012 +0100| [2f265d9087362c17920e4bce59b21653f3fffbfe] | committer: Michael Niedermayer

Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
  mpegvideo: treat delayed pictures as used

Conflicts:
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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