Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Aug 2011 13:07:12 +0000 (15:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Aug 2011 13:07:12 +0000 (15:07 +0200)
commitada49f936eaafe12365c7b962355d6dcfbfc4029
tree156ef379f06014ba97a73c7002b61b76c0a073a1
parentba57ef29723e11e94f2d5a07d4f384e636316c16
parent87cf70eb237e7586cc7399627dafa1b980ec0b7d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: correct implicit weight table computation for long ref pics
  h264: correct the check for invalid long term frame index in MMCO decode

Conflicts:
libavcodec/h264.c

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