• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ad60b3b1
    Michael Niedermayer authored
    * qatar/master:
      vorbis: Validate that the floor 1 X values contain no duplicates.
      avprobe: Identify codec probe failures rather than calling them unsupported codecs.
      avformat: Probe codecs at score 0 on buffer exhaustion conditions.
      avformat: Factorize codec probing.
      Indeo Audio decoder
      imc: make IMDCT support stereo output
      imc: move channel-specific data into separate context
      lavfi: remove request/poll and drawing functions from public API on next bump
      lavfi: make avfilter_insert_pad and pals private on next bump.
      lavfi: make formats API private on next bump.
      avplay: use buffersrc instead of custom input filter.
      avtools: move buffer management code from avconv to cmdutils.
      avconv: don't use InputStream in the buffer management code.
      avconv: fix exiting when max frames is reached.
      mpc8: fix maximum bands handling
      aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono.
    
    Conflicts:
    	Changelog
    	cmdutils.h
    	ffmpeg.c
    	ffplay.c
    	ffprobe.c
    	libavcodec/avcodec.h
    	libavcodec/mpc8.c
    	libavcodec/v210dec.h
    	libavcodec/version.h
    	libavcodec/vorbisdec.c
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/buffersrc.c
    	libavfilter/formats.c
    	libavfilter/src_movie.c
    	libavfilter/vf_aspect.c
    	libavfilter/vf_blackframe.c
    	libavfilter/vf_boxblur.c
    	libavfilter/vf_crop.c
    	libavfilter/vf_cropdetect.c
    	libavfilter/vf_delogo.c
    	libavfilter/vf_drawbox.c
    	libavfilter/vf_drawtext.c
    	libavfilter/vf_fade.c
    	libavfilter/vf_fifo.c
    	libavfilter/vf_format.c
    	libavfilter/vf_frei0r.c
    	libavfilter/vf_gradfun.c
    	libavfilter/vf_hflip.c
    	libavfilter/vf_hqdn3d.c
    	libavfilter/vf_libopencv.c
    	libavfilter/vf_lut.c
    	libavfilter/vf_overlay.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_scale.c
    	libavfilter/vf_select.c
    	libavfilter/vf_showinfo.c
    	libavfilter/vf_transpose.c
    	libavfilter/vf_unsharp.c
    	libavfilter/vf_yadif.c
    	libavfilter/vsrc_color.c
    	libavfilter/vsrc_testsrc.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ad60b3b1
riff.c 34.6 KB