Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Sep 2012 12:28:35 +0000 (14:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Sep 2012 12:28:35 +0000 (14:28 +0200)
commit20bd9210821cfbe1a119b71e103510c6714bf86a
tree6e7c8381812c554bd4ed85b7b77a5871fcc1ba59
parent853a93804d16c79028ba8005d4c033a403fc34f9
parent1a8c6917f68f7378465e18f7615762bfd22704c2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: avoid stuck buffer pointer in decode_nal_units
  mpeg12: fix the semantics of the int* parameter of decode()

Conflicts:
libavcodec/mpeg12.c

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