diff options
author | Paul B Mahol <onemda@gmail.com> | 2013-03-15 21:13:52 +0400 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2013-03-15 22:10:28 +0400 |
commit | a9b424879f101b56cf75c2db889477bba188fe20 (patch) | |
tree | a9e67fe3fba92feaca7bdeb8122ebe2772f339ae /libavformat/icodec.c | |
parent | 3d751b1ef6619b20631b17c880aa96f2dd3a11dd (diff) |
lavc & lavf: replace deprecated av_log* functions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/icodec.c')
-rw-r--r-- | libavformat/icodec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/icodec.c b/libavformat/icodec.c index 37909aab72..fa308da722 100644 --- a/libavformat/icodec.c +++ b/libavformat/icodec.c @@ -53,7 +53,7 @@ static int read_header(AVFormatContext *s) { IcoDemuxContext *ico = s->priv_data; AVIOContext *pb = s->pb; - int i; + int i, codec; avio_skip(pb, 4); ico->nb_images = avio_rl16(pb); @@ -88,7 +88,8 @@ static int read_header(AVFormatContext *s) if (avio_seek(pb, ico->images[i].offset, SEEK_SET) < 0) break; - switch(avio_rl32(pb)) { + codec = avio_rl32(pb); + switch (codec) { case MKTAG(0x89, 'P', 'N', 'G'): st->codec->codec_id = AV_CODEC_ID_PNG; st->codec->width = 0; @@ -106,7 +107,7 @@ static int read_header(AVFormatContext *s) st->codec->height = tmp / 2; break; default: - av_log_ask_for_sample(s, "unsupported codec\n"); + avpriv_request_sample(s, "codec %d", codec); return AVERROR_INVALIDDATA; } } |