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/au.c | |
| parent | fa92ee821bba1d3c2a497ed22e41927b552856f8 (diff) | |
| parent | 1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e (diff) | |
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/au.c')
| -rw-r--r-- | libavformat/au.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/au.c b/libavformat/au.c index db2ab27558..a29e80203b 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -96,13 +96,13 @@ static int au_read_header(AVFormatContext *s) codec = ff_codec_get_id(codec_au_tags, id); if (codec == AV_CODEC_ID_NONE) { - av_log_ask_for_sample(s, "unknown or unsupported codec tag: %u\n", id); + avpriv_request_sample(s, "unknown or unsupported codec tag: %u", id); return AVERROR_PATCHWELCOME; } bps = av_get_bits_per_sample(codec); if (!bps) { - av_log_ask_for_sample(s, "could not determine bits per sample\n"); + avpriv_request_sample(s, "Unknown bits per sample"); return AVERROR_PATCHWELCOME; } |