diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 02:16:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 02:16:09 +0200 |
| commit | 57e7d9d929783a7bf5728cecabcf4bea53473919 (patch) | |
| tree | 0017d0413fa0e3a546134fb922d03449b93b45c3 | |
| parent | 6542e5575f1425ecc9972a1bb7477d03816e40d0 (diff) | |
| parent | 7215fcf84032118ecd9fb54fb14154d69fea638d (diff) | |
| download | ffmpeg-57e7d9d929783a7bf5728cecabcf4bea53473919.tar.gz | |
Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'
* commit '7215fcf84032118ecd9fb54fb14154d69fea638d':
avformat: Mark AVOutputFormat argument in avformat_query_codec as const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 3 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 3358e2df1f..66638c8f22 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -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. * 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 diff --git a/libavformat/utils.c b/libavformat/utils.c index e095d601e1..9404118b96 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4171,7 +4171,7 @@ int64_t ff_iso8601_to_unix_time(const char *datestr) 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) { if (ofmt) { |