generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'

Browse Source 
* commit '7215fcf84032118ecd9fb54fb14154d69fea638d':
  avformat: Mark AVOutputFormat argument in avformat_query_codec as const

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-27 02:16:04 +02:00
commit 57e7d9d929
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avformat.h
View File

@ -2584,7 +2584,8 @@ int av_match_ext(const char *filename, const char *extensions);
* @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot. * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
* A negative number if this information is not available. * A negative number if this information is not available.
*/ */
int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance); int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
int std_compliance);
/** /**
* @defgroup riff_fourcc RIFF FourCCs * @defgroup riff_fourcc RIFF FourCCs

2
libavformat/utils.c
View File

@ -4171,7 +4171,7 @@ int64_t ff_iso8601_to_unix_time(const char *datestr)
return av_timegm(&time1); return av_timegm(&time1);
} }
int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
int std_compliance) int std_compliance)
{ {
if (ofmt) { if (ofmt) {