diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:03:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:03:22 +0100 |
| commit | 849f015406e77921a2adbe05e58b0e65cbf035c5 (patch) | |
| tree | 05a8b30cd52af9bbaf0ca6be59a2aae079600077 /libavformat/xwma.c | |
| parent | a62fced394825101b202a8bc6055e4932b371089 (diff) | |
| parent | a4472ac01e86f9fae5adb9034f2777b86a9c5480 (diff) | |
| download | ffmpeg-849f015406e77921a2adbe05e58b0e65cbf035c5.tar.gz | |
Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'
* commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480':
Add informative messages to av_log_ask_for_sample calls lacking them
anm: Get rid of some very silly goto statements
Conflicts:
libavformat/anm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/xwma.c')
| -rw-r--r-- | libavformat/xwma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/xwma.c b/libavformat/xwma.c index db7d9716ca..1a1e6e3844 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -85,9 +85,8 @@ static int xwma_read_header(AVFormatContext *s) * anyway. */ if (st->codec->codec_id != AV_CODEC_ID_WMAV2) { - av_log(s, AV_LOG_WARNING, "unexpected codec (tag 0x04%x; id %d)\n", + av_log_ask_for_sample(s, "unexpected codec (tag 0x04%x; id %d)\n", st->codec->codec_tag, st->codec->codec_id); - av_log_ask_for_sample(s, NULL); } else { /* In all xWMA files I have seen, there is no extradata. But the WMA * codecs require extradata, so we provide our own fake extradata. @@ -101,9 +100,8 @@ static int xwma_read_header(AVFormatContext *s) * if it will work, but just go on and try it, after asking * the user for a sample. */ - av_log(s, AV_LOG_WARNING, "unexpected extradata (%d bytes)\n", + av_log_ask_for_sample(s, "unexpected extradata (%d bytes)\n", st->codec->extradata_size); - av_log_ask_for_sample(s, NULL); } else { st->codec->extradata_size = 6; st->codec->extradata = av_mallocz(6 + FF_INPUT_BUFFER_PADDING_SIZE); |