diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:28:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:28:48 +0200 |
| commit | a5ba4e186bcb44c60f215e1367e3d5269b564cea (patch) | |
| tree | 0322f254e35dda891f4f4c1ba35146d1f66b798c /libavformat/rtsp.c | |
| parent | dbcf7e9ef7f88c7ffb4894622223e014dac1621c (diff) | |
| parent | e926b5ceb1962833f0c884a328382bc2eca67aff (diff) | |
| download | ffmpeg-a5ba4e186bcb44c60f215e1367e3d5269b564cea.tar.gz | |
Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'
* commit 'e926b5ceb1962833f0c884a328382bc2eca67aff':
avformat: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavformat/audiointerleave.c
libavformat/mux.c
libavformat/mxfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index dc94f0f795..7b35666fd4 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1120,11 +1120,11 @@ start: * * @return zero if success, nonzero otherwise */ -static int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s, - const char *method, const char *url, - const char *headers, - const unsigned char *send_content, - int send_content_length) +static int rtsp_send_cmd_with_content_async(AVFormatContext *s, + const char *method, const char *url, + const char *headers, + const unsigned char *send_content, + int send_content_length) { RTSPState *rt = s->priv_data; char buf[4096], *out_buf; @@ -1177,7 +1177,7 @@ static int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s, int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method, const char *url, const char *headers) { - return ff_rtsp_send_cmd_with_content_async(s, method, url, headers, NULL, 0); + return rtsp_send_cmd_with_content_async(s, method, url, headers, NULL, 0); } int ff_rtsp_send_cmd(AVFormatContext *s, const char *method, const char *url, @@ -1202,9 +1202,9 @@ int ff_rtsp_send_cmd_with_content(AVFormatContext *s, retry: cur_auth_type = rt->auth_state.auth_type; - if ((ret = ff_rtsp_send_cmd_with_content_async(s, method, url, header, - send_content, - send_content_length))) + if ((ret = rtsp_send_cmd_with_content_async(s, method, url, header, + send_content, + send_content_length))) return ret; if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0, method) ) < 0) |