• 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
..
ac3_rm Loading commit data...
adpcm_ima_wav Loading commit data...
adpcm_ms_wav Loading commit data...
adpcm_qt_aiff Loading commit data...
adpcm_swf_flv Loading commit data...
adpcm_yam_wav Loading commit data...
alac_m4a Loading commit data...
asv1_avi Loading commit data...
asv2_avi Loading commit data...
dnxhd_1080i_mov Loading commit data...
dnxhd_720p_dnxhd Loading commit data...
dnxhd_720p_rd_dnxhd Loading commit data...
dv411_dv Loading commit data...
dv50_dv Loading commit data...
dv_dv Loading commit data...
error_mpeg4_adv_avi Loading commit data...
ffv1_avi Loading commit data...
flac_flac Loading commit data...
flashsv_flv Loading commit data...
flv_flv Loading commit data...
g726_wav Loading commit data...
h261_avi Loading commit data...
h263_avi Loading commit data...
h263p_avi Loading commit data...
huffyuv_avi Loading commit data...
image_bmp Loading commit data...
image_jpg Loading commit data...
image_pcx Loading commit data...
image_pgm Loading commit data...
image_ppm Loading commit data...
image_sgi Loading commit data...
image_tga Loading commit data...
image_tiff Loading commit data...
jpegls_avi Loading commit data...
lavf_aif Loading commit data...
lavf_al Loading commit data...
lavf_asf Loading commit data...
lavf_au Loading commit data...
lavf_avi Loading commit data...
lavf_dv Loading commit data...
lavf_ffm Loading commit data...
lavf_flv Loading commit data...
lavf_gif Loading commit data...
lavf_gxf Loading commit data...
lavf_mkv Loading commit data...
lavf_mmf Loading commit data...
lavf_mov Loading commit data...
lavf_mpg Loading commit data...
lavf_mxf Loading commit data...
lavf_mxf_d10 Loading commit data...
lavf_nut Loading commit data...
lavf_ogg Loading commit data...
lavf_rm Loading commit data...
lavf_swf Loading commit data...
lavf_ts Loading commit data...
lavf_ul Loading commit data...
lavf_voc Loading commit data...
lavf_wav Loading commit data...
lavf_y4m Loading commit data...
ljpeg_avi Loading commit data...
mjpeg_avi Loading commit data...
mp2_mp2 Loading commit data...
mpeg1_mpg Loading commit data...
mpeg1b_mpg Loading commit data...
mpeg2_422_mpg Loading commit data...
mpeg2_mpg Loading commit data...
mpeg2i_mpg Loading commit data...
mpeg2ivlc_qprd_mpg Loading commit data...
mpeg2reuse_mpg Loading commit data...
mpeg2thread_mpg Loading commit data...
mpeg2threadivlc_mpg Loading commit data...
mpeg4_Q_avi Loading commit data...
mpeg4_adap_avi Loading commit data...
mpeg4_adv_avi Loading commit data...
mpeg4_nr_avi Loading commit data...
mpeg4_qprd_avi Loading commit data...
mpeg4_rc_avi Loading commit data...
mpeg4_thread_avi Loading commit data...
msmpeg4_avi Loading commit data...
msmpeg4v2_avi Loading commit data...
odivx_mp4 Loading commit data...
pbmpipe_pbm Loading commit data...
pcm_alaw_wav Loading commit data...
pcm_f32be_au Loading commit data...
pcm_f32le_wav Loading commit data...
pcm_f64be_au Loading commit data...
pcm_f64le_wav Loading commit data...
pcm_mulaw_wav Loading commit data...
pcm_s16be_mkv Loading commit data...
pcm_s16be_mov Loading commit data...
pcm_s16le_mkv Loading commit data...
pcm_s16le_wav Loading commit data...
pcm_s24be_mov Loading commit data...
pcm_s24daud_302 Loading commit data...
pcm_s24le_wav Loading commit data...
pcm_s32be_mov Loading commit data...
pcm_s32le_wav Loading commit data...
pcm_s8_mov Loading commit data...
pcm_u8_wav Loading commit data...
pgmpipe_pgm Loading commit data...
ppmpipe_ppm Loading commit data...
rgb_avi Loading commit data...
roqav_roq Loading commit data...
rv10_rm Loading commit data...
rv20_rm Loading commit data...
snow53_avi Loading commit data...
snow_avi Loading commit data...
svq1_mov Loading commit data...
wmav1_asf Loading commit data...
wmav2_asf Loading commit data...
wmv1_avi Loading commit data...
wmv2_avi Loading commit data...
yuv_avi Loading commit data...