• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 479fb7b8
    Michael Niedermayer authored
    * qatar/master: (35 commits)
      fix space type in Changelog
      ZeroCodec Decoder
      RealAudio Lossless decoder
      rtpenc: Use AVFormatContext.packet_size instead of a private option
      url: Document the expected behaviour of url_read
      libavformat: Use AVFormatContext.probesize in init_input
      docs: Fix a stray reference to tags in the generic doxy on dicts
      cosmetics: Align some AVInput/OutputFormat declarations
      zmbv: check decompress result
      zmbv: correct indentation
      adpcm: convert adpcm_thp to bytestream2.
      adpcm: convert adpcm_yamaha to bytestream2.
      adpcm: convert adpcm_swf to bytestream2.
      adpcm: convert adpcm_sbpro to bytestream2.
      adpcm: convert adpcm_ct to bytestream2.
      adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
      adpcm: convert adpcm_ea_xas to bytestream2.
      adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
      adpcm: convert ea_maxis_xa to bytestream2.
      adpcm: convert adpcm_ea to bytestream2.
      ...
    
    Conflicts:
    	Changelog
    	libavcodec/Makefile
    	libavcodec/adpcm.c
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavcodec/zerocodec.c
    	libavcodec/zmbv.c
    	libavformat/riff.c
    	libavformat/url.h
    	tests/ref/fate/truemotion1-15
    	tests/ref/fate/truemotion1-24
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    479fb7b8
rtpenc.h 3.75 KB