Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Dec 2012 15:29:07 +0000 (16:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Dec 2012 15:29:07 +0000 (16:29 +0100)
commit857d7194ca6d07fb9fa70c05826895d6b9c5e983
treee8c39b4af492a32e1f3e0cfe71d70c47a7371a31
parent6777aa638791d9a95efc5f7cddba7103fbb309b1
parenta394959bbee9e41ff121488f251f85e8a8fb3384
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: add a pointer for weighted prediction temporary buffer

Conflicts:
libavcodec/h264.c
libavcodec/h264.h

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