har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'

Browse Source 
* commit 'ec4f04da1a3462dac429b9d15dee5f027309da15':
  avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

Conflicts:
	libavformat/format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-27 02:09:41 +02:00
commit 6542e5575f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avformat.h
View File

@ -1752,14 +1752,14 @@ int avformat_network_deinit(void);
* if f is non-NULL, returns the next registered input format after f * if f is non-NULL, returns the next registered input format after f
* or NULL if f is the last one. * or NULL if f is the last one.
*/ */
AVInputFormat *av_iformat_next(AVInputFormat *f); AVInputFormat *av_iformat_next(const AVInputFormat *f);
/** /**
* If f is NULL, returns the first registered output format, * If f is NULL, returns the first registered output format,
* if f is non-NULL, returns the next registered output format after f * if f is non-NULL, returns the next registered output format after f
* or NULL if f is the last one. * or NULL if f is the last one.
*/ */
AVOutputFormat *av_oformat_next(AVOutputFormat *f); AVOutputFormat *av_oformat_next(const AVOutputFormat *f);
/** /**
* Allocate an AVFormatContext. * Allocate an AVFormatContext.

2
libavformat/avio.c
View File

@ -32,7 +32,7 @@
static URLProtocol *first_protocol = NULL; static URLProtocol *first_protocol = NULL;
URLProtocol *ffurl_protocol_next(URLProtocol *prev) URLProtocol *ffurl_protocol_next(const URLProtocol *prev)
{ {
return prev ? prev->next : first_protocol; return prev ? prev->next : first_protocol;
} }

4
libavformat/format.c
View File

@ -36,7 +36,7 @@ static AVOutputFormat *first_oformat = NULL;
static AVInputFormat **last_iformat = &first_iformat; static AVInputFormat **last_iformat = &first_iformat;
static AVOutputFormat **last_oformat = &first_oformat; static AVOutputFormat **last_oformat = &first_oformat;
AVInputFormat *av_iformat_next(AVInputFormat *f) AVInputFormat *av_iformat_next(const AVInputFormat *f)
{ {
if (f) if (f)
return f->next; return f->next;
@ -44,7 +44,7 @@ AVInputFormat *av_iformat_next(AVInputFormat *f)
return first_iformat; return first_iformat;
} }
AVOutputFormat *av_oformat_next(AVOutputFormat *f) AVOutputFormat *av_oformat_next(const AVOutputFormat *f)
{ {
if (f) if (f)
return f->next; return f->next;

2
libavformat/url.h
View File

@ -240,7 +240,7 @@ int ff_check_interrupt(AVIOInterruptCB *cb);
* *
* @param prev result of the previous call to this functions or NULL. * @param prev result of the previous call to this functions or NULL.
*/ */
URLProtocol *ffurl_protocol_next(URLProtocol *prev); URLProtocol *ffurl_protocol_next(const URLProtocol *prev);
/* udp.c */ /* udp.c */
int ff_udp_set_remote_url(URLContext *h, const char *uri); int ff_udp_set_remote_url(URLContext *h, const char *uri);