summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-03-09 16:30:03 +0100
committerDiego Biurrun <diego@biurrun.de>2013-03-12 11:09:45 +0100
commita4472ac01e86f9fae5adb9034f2777b86a9c5480 (patch)
tree80d9a366c765596141b9468c7fd0dd89af4dfd58 /libavformat
parent8f10f1a6dc0d326a146e169860a2de7a8356fdab (diff)
Add informative messages to av_log_ask_for_sample calls lacking them
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/anm.c2
-rw-r--r--libavformat/spdifenc.c3
-rw-r--r--libavformat/xwma.c6
3 files changed, 4 insertions, 7 deletions
diff --git a/libavformat/anm.c b/libavformat/anm.c
index dc24e78941..064b15739f 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -163,7 +163,7 @@ static int read_header(AVFormatContext *s)
return 0;
invalid:
- av_log_ask_for_sample(s, NULL);
+ av_log_ask_for_sample(s, "Invalid header element encountered.\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c
index cf421a7358..fbc757b797 100644
--- a/libavformat/spdifenc.c
+++ b/libavformat/spdifenc.c
@@ -412,8 +412,7 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt)
if (pkt->size > TRUEHD_FRAME_OFFSET - mat_code_length) {
/* if such frames exist, we'd need some more complex logic to
* distribute the TrueHD frames in the MAT frame */
- av_log(s, AV_LOG_ERROR, "TrueHD frame too big, %d bytes\n", pkt->size);
- av_log_ask_for_sample(s, NULL);
+ av_log_ask_for_sample(s, "TrueHD frame too big, %d bytes\n", pkt->size);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index baabf5775e..13ce2bb9f9 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);