• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 537a9e5c
    Michael Niedermayer authored
    * qatar/master:
      ppc: fix some pointer to integer casts
      ppc: fix 32-bit PIC build
      vmdaudio: fix decoding of 16-bit audio format.
      lavf: do not set codec_tag for rawvideo
      h264: check for out of bounds reads in ff_h264_decode_extradata().
      flvdec: Check for overflow before allocating arrays
      avconv: use correct output stream index when checking max_frames
      avconv: remove fake coded_frame on streamcopy hack
    
    Conflicts:
    	avconv.c
    	libavcodec/h264.c
    	libavcodec/ppc/asm.S
    	libavcodec/vmdav.c
    	libavformat/flvdec.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    537a9e5c
ffmpeg.c 163 KB