• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e387c9d5
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      rv40dsp x86: use only one register, for both increment and loop counter
      rv40dsp: implement prescaled versions for biweight.
      avconv: use default channel layouts when they are unknown
      avconv: parse channel layout string
      nutdec: K&R formatting cosmetics
      vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
      mem: Consistently return NULL for av_malloc(0)
      vf_overlay: implement poll_frame()
      vf_scale: support named constants for sws flags.
      lavc doxy: add all installed headers to doxy groups.
      lavc doxy: add avfft to the main lavc group.
      lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
      lavc doxy: add AVPicture functions to a doxy group.
      lavc doxy: add resampling functions to a doxy group.
      lavc doxy: replace \ with /
      lavc doxy: add encoding functions to a doxy group.
      lavc doxy: add decoding functions to a doxy group.
      lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
      lavc doxy: add AVPacket-related stuff to a separate doxy group.
      lavc doxy: add core functions/definitions to a doxy group.
      ...
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/avcodec.h
    	libavcodec/vda.c
    	libavcodec/x86/rv40dsp.asm
    	libavfilter/vf_scale.c
    	libavformat/nutdec.c
    	libavutil/mem.c
    	tests/ref/acodec/pcm_s24daud
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e387c9d5
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_anull.c Loading commit data...
af_aresample.c Loading commit data...
af_ashowinfo.c Loading commit data...
af_asplit.c Loading commit data...
af_astreamsync.c Loading commit data...
af_earwax.c Loading commit data...
af_pan.c Loading commit data...
af_silencedetect.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...
bbox.c Loading commit data...
bbox.h Loading commit data...
buffersink.h 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...
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...
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_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_split.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...
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...