• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c980be9e
    Michael Niedermayer authored
    * qatar/master: (21 commits)
      CDXL demuxer and decoder
      hls: Re-add legacy applehttp name to preserve interface compatibility.
      hlsproto: Rename the functions and context
      hlsproto: Encourage users to try the hls demuxer instead of the proto
      doc: Move the hls protocol section into the right place
      libavformat: Rename the applehttp protocol to hls
      hls: Rename the functions and context
      libavformat: Rename the applehttp demuxer to hls
      rtpdec: Support H263 in RFC 2190 format
      rv30: check block type validity
      ttadec: CRC checking
      movenc: Support muxing VC1
      avconv: Don't split out inline sequence headers when stream copying VC1
      rv34: handle size changes during frame multithreading
      rv40: prevent undefined signed overflow in rv40_loop_filter()
      rv34: use AVERROR return values in ff_rv34_decode_frame()
      rv34: use uint16_t for RV34DecContext.deblock_coefs
      librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
      movenc: Use defines instead of hardcoded numbers for RTCP types
      smjpegdec: implement seeking
      ...
    
    Conflicts:
    	Changelog
    	doc/general.texi
    	libavcodec/avcodec.h
    	libavcodec/rv30.c
    	libavcodec/tta.c
    	libavcodec/version.h
    	libavformat/Makefile
    	libavformat/allformats.c
    	libavformat/version.h
    	libswscale/x86/swscale_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c980be9e
version.h 2.58 KB