diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
| commit | 56ae5926f739bd26a5aa4add98604b7cd3c2d6ca (patch) | |
| tree | bd21824c32a6018f28d2e3c2c1d810ad77a3d1c5 /libavformat/allformats.c | |
| parent | d4838675253513504c4e0d0ed92489b3c4e6cf8d (diff) | |
| parent | 453c02f971fc7865dea396731accbcd7ab6d3728 (diff) | |
| download | ffmpeg-56ae5926f739bd26a5aa4add98604b7cd3c2d6ca.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 7ea4ebb378..94dc347cfe 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -272,6 +272,7 @@ void av_register_all(void) REGISTER_PROTOCOL (CACHE, cache); REGISTER_PROTOCOL (CONCAT, concat); REGISTER_PROTOCOL (CRYPTO, crypto); + REGISTER_PROTOCOL (FFRTMPHTTP, ffrtmphttp); REGISTER_PROTOCOL (FILE, file); REGISTER_PROTOCOL (GOPHER, gopher); REGISTER_PROTOCOL (HLS, hls); @@ -283,8 +284,9 @@ void av_register_all(void) REGISTER_PROTOCOL (MD5, md5); REGISTER_PROTOCOL (PIPE, pipe); REGISTER_PROTOCOL (RTMP, rtmp); - REGISTER_PROTOCOL (RTMPHTTP, rtmphttp); + REGISTER_PROTOCOL (RTMPS, rtmps); REGISTER_PROTOCOL (RTMPT, rtmpt); + REGISTER_PROTOCOL (RTMPTS, rtmpts); REGISTER_PROTOCOL (RTP, rtp); REGISTER_PROTOCOL (SCTP, sctp); REGISTER_PROTOCOL (TCP, tcp); |