Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 13:12:14 +0000 (14:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 13:12:14 +0000 (14:12 +0100)
commitacada70ffbd729516495ee683f70abad124f93d5
tree3c4626e79bca9730658665863ec93e038a8ad93e
parent4f91c45644931064901986bca70a8903c7956564
parentdb5b454c3d20f0e2e7fff8f0091e776ae9757725
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  Update changelog for 0.7.7 release
  mpeg12: do not decode extradata more than once.
  indeo4/5: check empty tile size in decode_mb_info().
  dfa: improve boundary checks in decode_dds1()
  indeo5dec: Make sure we have had a valid gop header.
  rv34: error out on size changes with frame threading

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dfa.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/ivi_common.h
libavcodec/mpeg12.c
libavcodec/rv34.c