• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 · b0804f37
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b0804f37
Makefile 8.68 KB