diff options
author | Jai Menon <jmenon86@gmail.com> | 2010-01-28 15:45:21 +0000 |
---|---|---|
committer | Jai Menon <jmenon86@gmail.com> | 2010-01-28 15:45:21 +0000 |
commit | 90d0379f5eddc549c7e0a2ea3f2dcf4471c25c51 (patch) | |
tree | 1692688c9d512665ec7a022aefc2c36ae9b155f7 /libavformat/img2.c | |
parent | 52ed8d0efeb5627ffdd64f44b97d1c8965f33cf1 (diff) | |
download | ffmpeg-90d0379f5eddc549c7e0a2ea3f2dcf4471c25c51.tar.gz |
Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img2.c')
-rw-r--r-- | libavformat/img2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 9fb8bc4cbf..124f135ddb 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -232,12 +232,12 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) st->duration = last_index - first_index + 1; } - if(ap->video_codec_id){ + if(s1->video_codec_id){ st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = ap->video_codec_id; - }else if(ap->audio_codec_id){ + st->codec->codec_id = s1->video_codec_id; + }else if(s1->audio_codec_id){ st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = ap->audio_codec_id; + st->codec->codec_id = s1->audio_codec_id; }else{ st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_id = av_str2id(img_tags, s->path); |