• 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
Name
Last commit
Last update
..
libmpcodecs Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
af_aconvert.c Loading commit data...
af_aformat.c Loading commit data...
af_amerge.c Loading commit data...
af_amix.c Loading commit data...
af_anull.c Loading commit data...
af_aresample.c Loading commit data...
af_ashowinfo.c Loading commit data...
af_astreamsync.c Loading commit data...
af_asyncts.c Loading commit data...
af_earwax.c Loading commit data...
af_pan.c Loading commit data...
af_resample.c Loading commit data...
af_silencedetect.c Loading commit data...
af_volume.c Loading commit data...
all_channel_layouts.inc Loading commit data...
allfilters.c Loading commit data...
asink_anullsink.c Loading commit data...
asrc_abuffer.h Loading commit data...
asrc_aevalsrc.c Loading commit data...
asrc_anullsrc.c Loading commit data...
audio.c Loading commit data...
audio.h Loading commit data...
avcodec.c Loading commit data...
avcodec.h Loading commit data...
avfilter.c Loading commit data...
avfilter.h Loading commit data...
avfiltergraph.c Loading commit data...
avfiltergraph.h Loading commit data...
bbox.c Loading commit data...
bbox.h Loading commit data...
buffer.c Loading commit data...
bufferqueue.h Loading commit data...
buffersink.c Loading commit data...
buffersink.h Loading commit data...
buffersrc.c Loading commit data...
buffersrc.h Loading commit data...
defaults.c Loading commit data...
drawutils.c Loading commit data...
drawutils.h Loading commit data...
formats.c Loading commit data...
formats.h Loading commit data...
gradfun.h Loading commit data...
graphdump.c Loading commit data...
graphparser.c Loading commit data...
internal.h Loading commit data...
lavfutils.c Loading commit data...
lavfutils.h Loading commit data...
libavfilter.v Loading commit data...
lswsutils.c Loading commit data...
lswsutils.h Loading commit data...
sink_buffer.c Loading commit data...
split.c Loading commit data...
src_buffer.c Loading commit data...
src_movie.c Loading commit data...
transform.c Loading commit data...
transform.h Loading commit data...
version.h Loading commit data...
vf_aspect.c Loading commit data...
vf_ass.c Loading commit data...
vf_bbox.c Loading commit data...
vf_blackdetect.c Loading commit data...
vf_blackframe.c Loading commit data...
vf_boxblur.c Loading commit data...
vf_colormatrix.c Loading commit data...
vf_copy.c Loading commit data...
vf_crop.c Loading commit data...
vf_cropdetect.c Loading commit data...
vf_delogo.c Loading commit data...
vf_deshake.c Loading commit data...
vf_drawbox.c Loading commit data...
vf_drawtext.c Loading commit data...
vf_fade.c Loading commit data...
vf_fieldorder.c Loading commit data...
vf_fifo.c Loading commit data...
vf_format.c Loading commit data...
vf_fps.c Loading commit data...
vf_frei0r.c Loading commit data...
vf_gradfun.c Loading commit data...
vf_hflip.c Loading commit data...
vf_hqdn3d.c Loading commit data...
vf_idet.c Loading commit data...
vf_libopencv.c Loading commit data...
vf_lut.c Loading commit data...
vf_mp.c Loading commit data...
vf_null.c Loading commit data...
vf_overlay.c Loading commit data...
vf_pad.c Loading commit data...
vf_pixdesctest.c Loading commit data...
vf_removelogo.c Loading commit data...
vf_scale.c Loading commit data...
vf_select.c Loading commit data...
vf_setfield.c Loading commit data...
vf_setpts.c Loading commit data...
vf_settb.c Loading commit data...
vf_showinfo.c Loading commit data...
vf_slicify.c Loading commit data...
vf_super2xsai.c Loading commit data...
vf_swapuv.c Loading commit data...
vf_thumbnail.c Loading commit data...
vf_tile.c Loading commit data...
vf_tinterlace.c Loading commit data...
vf_transpose.c Loading commit data...
vf_unsharp.c Loading commit data...
vf_vflip.c Loading commit data...
vf_yadif.c Loading commit data...
video.c Loading commit data...
video.h Loading commit data...
vsink_nullsink.c Loading commit data...
vsrc_buffer.h Loading commit data...
vsrc_cellauto.c Loading commit data...
vsrc_color.c Loading commit data...
vsrc_life.c Loading commit data...
vsrc_mandelbrot.c Loading commit data...
vsrc_mptestsrc.c Loading commit data...
vsrc_testsrc.c Loading commit data...
yadif.h Loading commit data...