• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 56ae5926
    Michael Niedermayer authored
    * qatar/master:
      libopenjpeg: introduce encoding support
      libopenjpeg: rename decoder source file.
      RTMPTS protocol support
      RTMPS protocol support
      avconv: print an error message when demuxing fails.
      tscc2: DCT output should not be clipped
      rtmp: Rename rtmphttp to ffrtmphttp
    
    Conflicts:
    	Changelog
    	configure
    	doc/general.texi
    	libavcodec/libopenjpegenc.c
    	libavcodec/version.h
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    56ae5926
rtmp.h 1.25 KB