• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 173715d2
    Michael Niedermayer authored
    * qatar/master: (35 commits)
      libopencore-amr: check output buffer size before decoding
      libopencore-amr: remove unneeded buf_size==0 check.
      libopencore-amr: remove unneeded frame_count field.
      aac_latm: remove unneeded check for zero-size packet.
      pcmdec: fix output buffer size check by calculating the actual output size prior to decoding.
      pcmdec: move codec-specific variable declarations to the corresponding codec blocks.
      pcmdec: return buf_size instead of src-buf.
      avcodec: remove the Zork PCM encoder.
      pcm_zork: use AV_SAMPLE_FMT_U8 instead of shifting all samples by 8.
      pcmenc: remove unneeded sample_fmt check.
      pcmdec: move number of channels check to pcm_decode_init()
      pcmdec: remove unnecessary check for sample_fmt change
      pcmdec: move DVD PCM bits_per_coded_sample check near to the code that sets the sample size.
      pcmdec: do not needlessly set *data_size to 0
      alacdec: remove unneeded NULL or zero-size packet checks.
      alacdec: simplify buffer allocation by using FF_ALLOC_OR_GOTO()
      alacdec: ask for a sample for unsupported sample depths.
      alacdec: cosmetics: use 'ch' instead of 'chan' to iterate channels
      alacdec: move some declarations to the top of the function
      alacdec: always use get_sbits_long() for uncompressed samples
      ...
    
    Conflicts:
    	libavcodec/pcm.c
    	tests/ref/acodec/pcm
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    173715d2
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...
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...