Commit 57e7d9d9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7215fcf8'

* commit '7215fcf8':
  avformat: Mark AVOutputFormat argument in avformat_query_codec as const
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6542e557 7215fcf8
......@@ -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
......
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment