Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:43:33 +0000 (17:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:43:33 +0000 (17:43 +0200)
commit9b0736c08ac59ae5da598ef32e9165ddf5c3f645
tree5754125f2b943c08708b94e111b55e8af597ab0c
parent70a1182a484402fc893d7fe4530d7bb9d636524a
parent3197a9c4fa46972077e12065047c3d52ef4b40f6
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  Update changelog for 0.7.8 release
  aac: check the maximum number of channels
  oggdec: fix faulty cleanup prototype
  qdm2: check that the FFT size is a power of 2
  rv10: check that extradata is large enough
  lavf: make sure stream probe data gets freed.
  dfa: check for invalid access in decode_wdlt().
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
Changelog
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c
libavcodec/dfa.c
libavcodec/qdm2.c
libavcodec/rv10.c
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/utils.c