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/anm.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/anm.c')
| -rw-r--r-- | libavformat/anm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/anm.c b/libavformat/anm.c index 79d31c1671..1c585750e6 100644 --- a/libavformat/anm.c +++ b/libavformat/anm.c @@ -85,7 +85,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 4); /* magic number */ if (avio_rl16(pb) != MAX_PAGES) { - av_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES) "\n"); + avpriv_request_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES)); return AVERROR_PATCHWELCOME; } @@ -163,7 +163,7 @@ static int read_header(AVFormatContext *s) return 0; invalid: - av_log_ask_for_sample(s, "Invalid header element encountered.\n"); + avpriv_request_sample(s, "Invalid header element"); return AVERROR_PATCHWELCOME; } |