• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 91eb1b15
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      prores: add FATE tests
      id3v2: reduce the scope of some non-globally-used symbols/structures
      id3v2: cosmetics: move some declarations before the places they are used
      shorten: remove the flush function.
      shn: do not allow seeking in the raw shn demuxer.
      avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
      avformat: update AVInputFormat allowed flags
      avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
      truespeech: use sizeof() instead of hardcoded sizes
      truespeech: remove unneeded variable, 'consumed'
      truespeech: simplify truespeech_read_frame() by using get_bits()
      truespeech: decode directly to output buffer instead of a temp buffer
      truespeech: check to make sure channels == 1
      truespeech: check for large enough output buffer rather than truncating output
      truespeech: remove unneeded zero-size packet check.
      mlpdec: return meaningful error codes instead of -1
      mlpdec: remove unnecessary wrapper function
      mlpdec: only calculate output size once
      mlpdec: validate that the reported channel count matches the actual output channel count
      pcm: reduce pointer type casting
      ...
    
    Conflicts:
    	libavformat/avformat.h
    	libavformat/id3v2.c
    	libavformat/id3v2.h
    	libavformat/utils.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    91eb1b15
pcm.c 17.6 KB