• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ef74ab20
    Michael Niedermayer authored
    * qatar/master: (34 commits)
      dpcm: return error if packet is too small
      dpcm: use smaller data types for static tables
      dpcm: use sol_table_16 directly instead of through the DPCMContext.
      dpcm: replace short with int16_t
      dpcm: check to make sure channels is 1 or 2.
      dpcm: misc pretty-printing
      dpcm: remove unnecessary variable by using bytestream functions.
      dpcm: move codec-specific variable declarations to their corresponding decoding blocks.
      dpcm: consistently use the variable name 'n' for the next input byte.
      dpcm: output AV_SAMPLE_FMT_U8 for Sol DPCM subcodecs 1 and 2.
      dpcm: calculate and check actual output data size prior to decoding.
      dpcm: factor out the stereo flag calculation
      dpcm: cosmetics: rename channel_number to ch
      avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address.
      lavf: Avoid using av_malloc(0) in av_dump_format
      dxva2_h264: pass the correct 8x8 scaling lists
      dca: NEON optimised high freq VQ decoding
      avcodec: reject audio packets with NULL data and non-zero size
      dxva: Add ability to enable workaround for older ATI cards
      latmenc: Set latmBufferFullness to largest value to indicate it is not used
      ...
    
    Conflicts:
    	libavcodec/dxva2_h264.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ef74ab20
adpcm_data.c 2.66 KB