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)
* 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>
1  2 
libavcodec/h264.c

Simple merge