• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 5dc6bd86
    Michael Niedermayer authored
    * qatar/master:
      APIchanges: fill in missing hashes and dates.
      Add an APIChanges entry and bump minor versions for recent changes.
      ffmpeg: print the low bitrate warning after the codec is openend.
      doxygen: Move function documentation into the macro generating the function.
      doxygen: Make sure parameter names match between .c and .h files.
      h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
      H.264: Add more x86 assembly for 10-bit H.264 predict functions
      lavf: fix invalid reads in avformat_find_stream_info()
      cmdutils: replace opt_default with opt_default2() and remove set_context_opts
      ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
      ffplay: use new avcodec_open2 and avformat_find_stream_info API.
      cmdutils: store all codec options in one dict instead of video/audio/sub
      ffmpeg: check experimental flag after codec is opened.
      ffmpeg: do not set GLOBAL_HEADER flag in the options context
    
    Conflicts:
    	cmdutils.c
    	doc/APIchanges
    	ffmpeg.c
    	ffplay.c
    	libavcodec/version.h
    	libavformat/version.h
    	libswscale/swscale_unscaled.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5dc6bd86
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...
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...
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...
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...
png_mmx.c Loading commit data...
simple_idct_mmx.c Loading commit data...
snowdsp_mmx.c 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...
x86inc.asm Loading commit data...
x86util.asm Loading commit data...