Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Sep 2013 06:44:14 +0000 (08:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Sep 2013 07:10:20 +0000 (09:10 +0200)
commitbf312714786a4018e9bf1c7f4c5444d906ae0a37
tree695ec5ca8bed836a9e9fcc7a22f3c0b9b901f517
parent8715ca0b82c1a1cc2ec9998acca990bbe63d4a34
parent4d073ddac95d789f23c3ee6f7b5348599b39f047
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  Update Changelog
  Prepare for 9.9 RELEASE
  lavf: fix the comparison in an overflow check
  dv: Add a guard to not overread the ppcm array
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
Changelog
RELEASE
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/nuv.c
libavformat/dv.c
libavformat/utils.c