git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
[ffmpeg.git]
/
libavformat
/
img2.c
diff --git
a/libavformat/img2.c
b/libavformat/img2.c
index
9fb8bc4
..
124f135
100644
(file)
--- 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;
}
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_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_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);
}else{
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = av_str2id(img_tags, s->path);