Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jan 2013 01:33:07 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jan 2013 01:33:07 +0000 (02:33 +0100)
commit492eb0aa14b694deb777ff4e75cd9ebe130c4d23
treef2f88d35046c33f00fac1130f2056176c170097e
parentc961ce969a613e08c720cb6aa3cce4bd81cefe3f
parentcf2cab5b2ab80fa2914692e02fa3488aaab7697e
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  Update Changelog
  h264: check ref_count validity for num_ref_idx_active_override_flag
  h264: check context state before decoding slice data partitions
  oggdec: free the ogg streams on read_header failure
  oggdec: check memory allocation
  Fix uninitialized reads on malformed ogg files.
  rtsp: Recheck the reordering queue if getting a new packet
  opt: avoid segfault in av_opt_next() if the class does not have an option list
  alacdec: do not be too strict about the extradata size

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/alac.c
libavcodec/h264.c
libavformat/oggdec.c
libavformat/rtsp.c
libavutil/opt.c