• 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
..
Makefile Loading commit data...
ac3dsp.asm Loading commit data...
ac3dsp_mmx.c Loading commit data...
cabac.h Loading commit data...
cavsdsp_mmx.c Loading commit data...
dct32_sse.asm Loading commit data...
deinterlace.asm Loading commit data...
diracdsp_mmx.c Loading commit data...
diracdsp_mmx.h Loading commit data...
diracdsp_yasm.asm Loading commit data...
dnxhd_mmx.c Loading commit data...
dsputil_mmx.c Loading commit data...
dsputil_mmx.h Loading commit data...
dsputil_mmx_avg_template.c Loading commit data...
dsputil_mmx_qns_template.c Loading commit data...
dsputil_mmx_rnd_template.c Loading commit data...
dsputil_yasm.asm Loading commit data...
dsputilenc_mmx.c Loading commit data...
dsputilenc_yasm.asm Loading commit data...
dwt.c Loading commit data...
dwt.h Loading commit data...
dwt_yasm.asm Loading commit data...
fdct_mmx.c Loading commit data...
fft.c Loading commit data...
fft.h Loading commit data...
fft_3dn.c Loading commit data...
fft_3dn2.c Loading commit data...
fft_mmx.asm Loading commit data...
fft_sse.c Loading commit data...
fmtconvert.asm Loading commit data...
fmtconvert_mmx.c Loading commit data...
h264_chromamc.asm Loading commit data...
h264_chromamc_10bit.asm Loading commit data...
h264_deblock.asm Loading commit data...
h264_deblock_10bit.asm Loading commit data...
h264_i386.h Loading commit data...
h264_idct.asm Loading commit data...
h264_idct_10bit.asm Loading commit data...
h264_intrapred.asm Loading commit data...
h264_intrapred_10bit.asm Loading commit data...
h264_intrapred_init.c Loading commit data...
h264_qpel_10bit.asm Loading commit data...
h264_qpel_mmx.c Loading commit data...
h264_weight.asm Loading commit data...
h264_weight_10bit.asm Loading commit data...
h264dsp_mmx.c Loading commit data...
idct_mmx.c Loading commit data...
idct_mmx_xvid.c Loading commit data...
idct_sse2_xvid.c Loading commit data...
idct_xvid.h Loading commit data...
imdct36_sse.asm Loading commit data...
lpc_mmx.c Loading commit data...
mathops.h Loading commit data...
mlpdsp.c Loading commit data...
motion_est_mmx.c Loading commit data...
mpegaudiodec_mmx.c Loading commit data...
mpegvideo_mmx.c Loading commit data...
mpegvideo_mmx_template.c Loading commit data...
pngdsp-init.c Loading commit data...
pngdsp.asm Loading commit data...
proresdsp-init.c Loading commit data...
proresdsp.asm Loading commit data...
rv34dsp.asm Loading commit data...
rv34dsp_init.c Loading commit data...
rv40dsp.asm Loading commit data...
rv40dsp_init.c Loading commit data...
sbrdsp.asm Loading commit data...
sbrdsp_init.c Loading commit data...
simple_idct_mmx.c Loading commit data...
snowdsp_mmx.c Loading commit data...
v210-init.c Loading commit data...
v210.asm Loading commit data...
vc1dsp_mmx.c Loading commit data...
vc1dsp_yasm.asm Loading commit data...
vp3dsp.asm Loading commit data...
vp56_arith.h Loading commit data...
vp56dsp.asm Loading commit data...
vp56dsp_init.c Loading commit data...
vp8dsp-init.c Loading commit data...
vp8dsp.asm Loading commit data...
w64xmmtest.c Loading commit data...