Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:51:26 +0000 (12:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:51:26 +0000 (12:51 +0200)
commitf7f74a37b82d7905e49aeb8beed02a9966f15ef6
tree8dcf232b8665fd2dc9d9f8e99d83eb6bcf6ebe5b
parent91248f081f343cde894a9c60624b6f4dc4581c94
parent4baba6c813b7a1f27370e20fb1a87b05fcb39208
Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'

* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is present.

Conflicts:
libavcodec/h264.c

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