Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:38:55 +0000 (12:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:39:02 +0000 (12:39 +0200)
commit91248f081f343cde894a9c60624b6f4dc4581c94
treea60c5ee84c0ae56eb907e55c415cdc6630cbdf49
parent83bfcc3ce2554bd12d5eb790836530d3430bd908
parentb81dbd6cb7522bea96d78a52f8a4c25a47b820c9
Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'

* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.

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