diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:41:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:41:34 +0100 |
| commit | a9ddb624890dd8c334617239793e63d93fbd52ee (patch) | |
| tree | d1b6919c46a238f1a9c926106cddb0d283badd60 /libavformat/smjpegdec.c | |
| parent | fa92ee821bba1d3c2a497ed22e41927b552856f8 (diff) | |
| parent | 1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e (diff) | |
| download | ffmpeg-a9ddb624890dd8c334617239793e63d93fbd52ee.tar.gz | |
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpegdec.c')
| -rw-r--r-- | libavformat/smjpegdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c index f32f635d5f..38ac2fb086 100644 --- a/libavformat/smjpegdec.c +++ b/libavformat/smjpegdec.c @@ -52,7 +52,7 @@ static int smjpeg_read_header(AVFormatContext *s) avio_skip(pb, 8); // magic version = avio_rb32(pb); if (version) - av_log_ask_for_sample(s, "unknown version %d\n", version); + avpriv_request_sample(s, "Unknown version %d", version); duration = avio_rb32(pb); // in msec @@ -77,7 +77,7 @@ static int smjpeg_read_header(AVFormatContext *s) break; case SMJPEG_SND: if (ast) { - av_log_ask_for_sample(s, "multiple audio streams not supported\n"); + avpriv_request_sample(s, "Multiple audio streams"); return AVERROR_PATCHWELCOME; } hlength = avio_rb32(pb); @@ -100,7 +100,7 @@ static int smjpeg_read_header(AVFormatContext *s) break; case SMJPEG_VID: if (vst) { - av_log_ask_for_sample(s, "multiple video streams not supported\n"); + avpriv_request_sample(s, "Multiple video streams"); return AVERROR_INVALIDDATA; } hlength = avio_rb32(pb); |