• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e99f1a8c
    Michael Niedermayer authored
    * qatar/master:
      dxva2: don't check for DXVA_PictureParameters->wDecodedPictureIndex
      img2: split muxer and demuxer into separate files
      rm: prevent infinite loops for index parsing.
      aac: fix infinite loop on end-of-frame with sequence of 1-bits.
      mov: Add more HDV and XDCAM FourCCs.
      lavf: don't set AVCodecContext.has_b_frames in compute_pkt_fields().
      rmdec: when using INT4 deinterleaving, error out if sub_packet_h <= 1.
      cdxl: correctly synchronize video timestamps to audio
      mlpdec_parser: fix a few channel layouts.
      Add channel names to channel_names[] array for channels added in b2890f5e
      movenc: Buffer the mdat for the initial moov fragment, too
      flvdec: Ignore the index if the ignidx flag is set
      flvdec: Fix indentation
      movdec: Don't parse all fragments if ignidx is set
      movdec: Restart parsing root-level atoms at the right spot
      prores: use natural integer type for the codebook index
      mov: Add support for MPEG2 HDV 720p24 (hdv4)
      swscale: K&R formatting cosmetics (part I)
      swscale: variable declaration and placement cosmetics
    
    Conflicts:
    	configure
    	libavcodec/aacdec.c
    	libavcodec/mlp_parser.c
    	libavformat/flvdec.c
    	libavformat/img2.c
    	libavformat/isom.h
    	libavformat/mov.c
    	libavformat/movenc.c
    	libswscale/rgb2rgb.c
    	libswscale/rgb2rgb_template.c
    	libswscale/yuv2rgb.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e99f1a8c
audioconvert.c 6.68 KB