diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-15 01:38:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-15 01:52:14 +0100 |
| commit | c980be9e3aafad57ec769cbb16c9ad6e640479cb (patch) | |
| tree | a804c9e2517a2e8ec9e5f22890862cbb226a66da /libavformat/librtmp.c | |
| parent | e7dbfa59f218ece7ec65f7ea0ff2950573dd2267 (diff) | |
| parent | dc4e57489fa0f9cf4faf4c85cc405d6db77d84db (diff) | |
| download | ffmpeg-c980be9e3aafad57ec769cbb16c9ad6e640479cb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/librtmp.c')
| -rw-r--r-- | libavformat/librtmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index e433860823..d717c644d6 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -152,7 +152,7 @@ static int rtmp_get_file_handle(URLContext *s) return RTMP_Socket(r); } -URLProtocol ff_rtmp_protocol = { +URLProtocol ff_librtmp_protocol = { .name = "rtmp", .url_open = rtmp_open, .url_read = rtmp_read, @@ -165,7 +165,7 @@ URLProtocol ff_rtmp_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmpt_protocol = { +URLProtocol ff_librtmpt_protocol = { .name = "rtmpt", .url_open = rtmp_open, .url_read = rtmp_read, @@ -178,7 +178,7 @@ URLProtocol ff_rtmpt_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmpe_protocol = { +URLProtocol ff_librtmpe_protocol = { .name = "rtmpe", .url_open = rtmp_open, .url_read = rtmp_read, @@ -191,7 +191,7 @@ URLProtocol ff_rtmpe_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmpte_protocol = { +URLProtocol ff_librtmpte_protocol = { .name = "rtmpte", .url_open = rtmp_open, .url_read = rtmp_read, @@ -204,7 +204,7 @@ URLProtocol ff_rtmpte_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmps_protocol = { +URLProtocol ff_librtmps_protocol = { .name = "rtmps", .url_open = rtmp_open, .url_read = rtmp_read, |