• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d0ad91c2
    Michael Niedermayer authored
    * qatar/master:
      os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
      http: Add support for reading http POST reply headers
      http: Add http_shutdown() for ending writing of posts
      tcp: Allow signalling end of reading/writing
      avio: Add a function for signalling end of reading/writing
      lavfi: fix comment, audio is supported now.
      lavfi: fix incorrect comment.
      lavfi: remove avfilter_null_* from public API on next bump.
      lavfi: remove avfilter_default_* from public API on next bump.
      lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
      avfiltergraph: smarter sample format selection.
      avconv: rename transcode_audio/video to decode_audio/video.
      asyncts: reset delta to 0 when it's not used.
      x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
      dwt: return errors from ff_slice_buffer_init()
    
    Conflicts:
    	ffmpeg.c
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/formats.c
    	libavfilter/version.h
    	libavfilter/vf_blackframe.c
    	libavfilter/vf_drawtext.c
    	libavfilter/vf_fade.c
    	libavfilter/vf_format.c
    	libavfilter/vf_showinfo.c
    	libavfilter/video.c
    	libavfilter/video.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d0ad91c2
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...