• 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
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
avconv.c Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...