highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'qatar/master'

Browse Source 
* qatar/master:
  lavf: bump minor and add an APIChanges entry for avformat cleanup
  lavf: get rid of ffm-specific stuff in avformat.h
Not pulled:  avio: deprecate av_protocol_next().
  avio: add a function for iterating though protocol names.
  lavf: rename a parameter of av_sdp_create from buff->buf
  lavf: rename avf_sdp_create to av_sdp_create.
  lavf: make av_guess_image2_codec internal
  avio: make URLProtocol internal.
  avio: make URLContext internal.
  lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
  lavf: use designated initializers for all protocols
  applehttp: don't use deprecated url_ functions.
  avio: move two ff_udp_* functions from avio_internal to url.h
  asfdec: remove a forgotten declaration of nonexistent function
  avio: deprecate the typedef for URLInterruptCB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-04-09 03:09:49 +02:00
parent a61bc91d42 0c68c80419
commit d4d09329ee
34 changed files with 249 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
libavformat/librtmp.c
View File

@@ -25,6 +25,7 @@
*/
#include "avformat.h"
#include "url.h"
#include <librtmp/rtmp.h>
#include <librtmp/log.h>
@@ -158,66 +159,56 @@ static int rtmp_get_file_handle(URLContext *s)
}
URLProtocol ff_rtmp_protocol = {
"rtmp",
rtmp_open,
rtmp_read,
rtmp_write,
NULL, /* seek */
rtmp_close,
NULL, /* next */
rtmp_read_pause,
rtmp_read_seek,
rtmp_get_file_handle
.name = "rtmp",
.url_open = rtmp_open,
.url_read = rtmp_read,
.url_write = rtmp_write,
.url_close = rtmp_close,
.url_read_pause = rtmp_read_pause,
.url_read_seek = rtmp_read_seek,
.url_get_file_handle = rtmp_get_file_handle
};
URLProtocol ff_rtmpt_protocol = {
"rtmpt",
rtmp_open,
rtmp_read,
rtmp_write,
NULL, /* seek */
rtmp_close,
NULL, /* next */
rtmp_read_pause,
rtmp_read_seek,
rtmp_get_file_handle
.name = "rtmpt",
.url_open = rtmp_open,
.url_read = rtmp_read,
.url_write = rtmp_write,
.url_close = rtmp_close,
.url_read_pause = rtmp_read_pause,
.url_read_seek = rtmp_read_seek,
.url_get_file_handle = rtmp_get_file_handle
};
URLProtocol ff_rtmpe_protocol = {
"rtmpe",
rtmp_open,
rtmp_read,
rtmp_write,
NULL, /* seek */
rtmp_close,
NULL, /* next */
rtmp_read_pause,
rtmp_read_seek,
rtmp_get_file_handle
.name = "rtmpe",
.url_open = rtmp_open,
.url_read = rtmp_read,
.url_write = rtmp_write,
.url_close = rtmp_close,
.url_read_pause = rtmp_read_pause,
.url_read_seek = rtmp_read_seek,
.url_get_file_handle = rtmp_get_file_handle
};
URLProtocol ff_rtmpte_protocol = {
"rtmpte",
rtmp_open,
rtmp_read,
rtmp_write,
NULL, /* seek */
rtmp_close,
NULL, /* next */
rtmp_read_pause,
rtmp_read_seek,
rtmp_get_file_handle
.name = "rtmpte",
.url_open = rtmp_open,
.url_read = rtmp_read,
.url_write = rtmp_write,
.url_close = rtmp_close,
.url_read_pause = rtmp_read_pause,
.url_read_seek = rtmp_read_seek,
.url_get_file_handle = rtmp_get_file_handle
};
URLProtocol ff_rtmps_protocol = {
"rtmps",
rtmp_open,
rtmp_read,
rtmp_write,
NULL, /* seek */
rtmp_close,
NULL, /* next */
rtmp_read_pause,
rtmp_read_seek,
rtmp_get_file_handle
.name = "rtmps",
.url_open = rtmp_open,
.url_read = rtmp_read,
.url_write = rtmp_write,
.url_close = rtmp_close,
.url_read_pause = rtmp_read_pause,
.url_read_seek = rtmp_read_seek,
.url_get_file_handle = rtmp_get_file_handle
};