[FFmpeg-cvslog] Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 11:38:42 2015 +0200| [e8a460672f7e9aec129a7cfa01345857b1565a15] | committer: Michael Niedermayer

Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'

* commit '9d33bab583a82cf12286c65258a29c6888e1ff98':
  h264: drop H264Context.ouputed_poc

Conflicts:
	libavcodec/h264.c

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

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