Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Oct 2011 20:42:41 +0000 (22:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Oct 2011 20:42:41 +0000 (22:42 +0200)
* qatar/release/0.7: (73 commits)
  Update Changelog for 0.7.2 release
  Update RELEASE file for 0.7.2
  lavf: do not set codec_tag for rawvideo
  fate: allow testing with libavfilter disabled
  fate: separate lavf-mxf_d10 test from lavf-mxf
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  movenc: fix NULL reference in mov_write_tkhd_tag
  movenc: create an alternate group for each media type
  flvdec: Check for overflow before allocating arrays
  ppc: fix some pointer to integer casts
  ppc: fix 32-bit PIC build
  rv34: Check for invalid slice offsets
  rv34: Fix potential overreads
  rv34: Avoid NULL dereference on corrupted bitstream
  rv10: Reject slices that does not have the same type as the first one
  lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails
  oggdec: fix out of bound write in the ogg demuxer
  Fixed size given to init_get_bits().
  smacker: fix a few off by 1 errors
  Check for invalid VLC value in smacker decoder.
  ...

Conflicts:
RELEASE
libavcodec/avs.c
libavcodec/ppc/asm.S
libavcodec/rv34.c
libavcodec/xan.c
libavdevice/alsa-audio.h
libavformat/flvdec.c
libavformat/gxf.c
libavformat/utils.c
libswscale/x86/swscale_template.c
tests/ref/lavf/mov
tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
Changelog
Makefile
configure
libavcodec/ppc/asm.S
libavcodec/ppc/fft_altivec_s.S
libavformat/matroskadec.c
libavformat/movenc.c
libswscale/ppc/swscale_altivec.c
tests/ref/lavf/mov
tests/ref/lavf/mxf
tests/ref/lavf/mxf_d10

diff --cc Changelog
+++ b/Changelog
@@@ -16,13 -58,9 +58,14 @@@ version 0.7.1
  - ffmpeg: fix operation with --disable-avfilter
  - fixed integer underflow in matroska decoder
  
  version 0.7:
  
 +- many many things we forgot because we rather write code than changelogs
 +- libmpcodecs video filter support (3 times as many filters than before)
 +- mpeg2 aspect ratio dection fixed
 +- libxvid aspect pickiness fixed
 +- Frame multithreaded decoding
  - E-AC-3 audio encoder
  - ac3enc: add channel coupling support
  - floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
diff --cc Makefile
Simple merge
diff --cc configure
Simple merge
Simple merge
Simple merge
@@@ -993,13 -966,15 +994,18 @@@ static int matroska_decode_buffer(uint8
          zstream.avail_in = isize;
          do {
              pkt_size *= 3;
-             pkt_data = av_realloc(pkt_data, pkt_size);
+             newpktdata = av_realloc(pkt_data, pkt_size);
+             if (!newpktdata) {
+                 inflateEnd(&zstream);
+                 goto failed;
+             }
+             pkt_data = newpktdata;
              zstream.avail_out = pkt_size - zstream.total_out;
              zstream.next_out = pkt_data + zstream.total_out;
 -            result = inflate(&zstream, Z_NO_FLUSH);
 +            if (pkt_data) {
 +                result = inflate(&zstream, Z_NO_FLUSH);
 +            } else
 +                result = Z_MEM_ERROR;
          } while (result==Z_OK && pkt_size<10000000);
          pkt_size = zstream.total_out;
          inflateEnd(&zstream);
          bzstream.avail_in = isize;
          do {
              pkt_size *= 3;
-             pkt_data = av_realloc(pkt_data, pkt_size);
+             newpktdata = av_realloc(pkt_data, pkt_size);
+             if (!newpktdata) {
+                 BZ2_bzDecompressEnd(&bzstream);
+                 goto failed;
+             }
+             pkt_data = newpktdata;
              bzstream.avail_out = pkt_size - bzstream.total_out_lo32;
              bzstream.next_out = pkt_data + bzstream.total_out_lo32;
 -            result = BZ2_bzDecompress(&bzstream);
 +            if (pkt_data) {
 +                result = BZ2_bzDecompress(&bzstream);
 +            } else
 +                result = BZ_MEM_ERROR;
          } while (result==BZ_OK && pkt_size<10000000);
          pkt_size = bzstream.total_out_lo32;
          BZ2_bzDecompressEnd(&bzstream);
Simple merge
Simple merge
@@@ -1,3 -1,3 +1,3 @@@
- a901cd05609080e8f5c09ca5da7290f0 *./tests/data/lavf/lavf.mov
 -4a3ad13f0355cb5d119109778d555207 *./tests/data/lavf/lavf.mov
++2e2529d01dbe42e4dd63580a351898f5 *./tests/data/lavf/lavf.mov
  357681 ./tests/data/lavf/lavf.mov
  ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
@@@ -1,6 -1,3 +1,3 @@@
 -6e9bd63c5cadd7550ad313553ebf665f *./tests/data/lavf/lavf.mxf
 +785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf
  525881 ./tests/data/lavf/lavf.mxf
  ./tests/data/lavf/lavf.mxf CRC=0x4ace0849
- b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10
- 5330989 ./tests/data/lavf/lavf.mxf_d10
- ./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e
index 0000000,f59a99e..2582022
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,3 +1,3 @@@
 -e7168856f2b54c6272685967e707fb21 *./tests/data/lavf/lavf.mxf_d10
++b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10
+ 5330989 ./tests/data/lavf/lavf.mxf_d10
+ ./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e