• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 52c522c7
    Michael Niedermayer authored
    * qatar/master: (27 commits)
      asfdec: add side data to ASFStream packet instead of output packet.
      idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.
      nellymoserdec: Indicate that the decoder can handle changed parameters
      libavcodec: Apply parameter change side data when decoding audio
      flvdec: Add param change side data if the sample rate or channels have changed
      libavformat: Add a utility function for adding parameter change side data
      libavcodec: Define a side data type for parameter changes
      aacdec: Handle new extradata passed as side data
      flvdec: Export new AAC/H.264 extradata as side data on the next packet
      libavcodec: Define a side data type for new extradata
      flacdec: skip all track indices at once instead of looping.
      mxf: Add PictureEssenceCoding UL for V210.
      mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*
      mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
      mxf: H.264/MPEG-4 AVC Intra support
      configure: Show whether the safe bitstream reader is enabled
      x86: Tighten register constraints for decode_significance*_x86.
      Replace Subversion revisions in comments by Git hashes.
      h264_cabac: synchronize decode_significance_*_x86 conditionals
      w32threads: wait for the waked thread in pthread_cond_signal.
      ...
    
    Conflicts:
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavformat/flvdec.c
    	libavformat/utils.c
    	tests/ref/lavfi/pixdesc
    	tests/ref/lavfi/pixfmts_copy
    	tests/ref/lavfi/pixfmts_null
    	tests/ref/lavfi/pixfmts_scale
    	tests/ref/lavfi/pixfmts_vflip
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    52c522c7
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...
png_mmx.c Loading commit data...
proresdsp-init.c Loading commit data...
proresdsp.asm Loading commit data...
rv40dsp.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...