• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8bc7fe4d
    Michael Niedermayer authored
    * qatar/master:
      doxygen: misc consistency, spelling and wording fixes
      vcr1: drop unnecessary emms_c() calls without MMX code
      Replace all uses of av_close_input_file() with avformat_close_input().
      lavf: add avformat_close_input().
      lavf: deprecate av_close_input_stream().
      lavf doxy: add some basic demuxing documentation.
      lavf doxy: add some general lavf information.
      lavf doxy: add misc utility functions to a group.
      lavf doxy: add av_guess_codec/format to the encoding group.
      lavf doxy: add core functions to a doxy group.
      Add basic libavdevice documentation.
      lavc: convert error_recognition to err_recognition.
      avconv: update -map option help text
      x86: Require 7 registers for the cabac asm
      x86: bswap: remove test for bswap instruction
      bswap: make generic implementation more compiler-friendly
      h264: remove useless cast
      proresdec: fix decode_slice() prototype
    
    Conflicts:
    	configure
    	doc/APIchanges
    	ffprobe.c
    	libavcodec/avcodec.h
    	libavcodec/celp_math.h
    	libavcodec/h264.c
    	libavfilter/src_movie.c
    	libavformat/anm.c
    	libavformat/avformat.h
    	libavformat/version.h
    	libavutil/avstring.h
    	libavutil/bswap.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8bc7fe4d
Name
Last commit
Last update
..
libmpcodecs Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
af_aconvert.c Loading commit data...
af_aconvert_rematrix.c Loading commit data...
af_aformat.c Loading commit data...
af_anull.c Loading commit data...
af_aresample.c Loading commit data...
af_ashowinfo.c Loading commit data...
af_earwax.c Loading commit data...
af_pan.c Loading commit data...
af_volume.c Loading commit data...
all_channel_layouts.h Loading commit data...
allfilters.c Loading commit data...
asink_anullsink.c Loading commit data...
asrc_abuffer.c Loading commit data...
asrc_abuffer.h Loading commit data...
asrc_aevalsrc.c Loading commit data...
asrc_anullsrc.c 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...
buffersink.h Loading commit data...
defaults.c Loading commit data...
drawutils.c Loading commit data...
drawutils.h Loading commit data...
formats.c Loading commit data...
gradfun.h Loading commit data...
graphparser.c Loading commit data...
internal.h Loading commit data...
libavfilter.v Loading commit data...
sink_buffer.c Loading commit data...
src_movie.c Loading commit data...
transform.c Loading commit data...
transform.h Loading commit data...
vf_aspect.c Loading commit data...
vf_ass.c Loading commit data...
vf_blackframe.c Loading commit data...
vf_boxblur.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_frei0r.c Loading commit data...
vf_gradfun.c Loading commit data...
vf_hflip.c Loading commit data...
vf_hqdn3d.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_scale.c Loading commit data...
vf_select.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_split.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...
vsink_nullsink.c Loading commit data...
vsrc_buffer.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...