Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:38:42 +0000 (11:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:38:42 +0000 (11:38 +0200)
commite8a460672f7e9aec129a7cfa01345857b1565a15
treee1ac45a7358c1502eadc93d9389267e41044eb08
parent0d5e615c10583af5f346f0bc7420ebc5077a5d47
parent9d33bab583a82cf12286c65258a29c6888e1ff98
Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'

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

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c