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/westwood_aud.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/westwood_aud.c')
| -rw-r--r-- | libavformat/westwood_aud.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index f4b8584b26..d66611758b 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -102,7 +102,7 @@ static int wsaud_read_header(AVFormatContext *s) switch (codec) { case 1: if (channels != 1) { - av_log_ask_for_sample(s, "Stereo WS-SND1 is not supported.\n"); + avpriv_request_sample(s, "Stereo WS-SND1"); return AVERROR_PATCHWELCOME; } st->codec->codec_id = AV_CODEC_ID_WESTWOOD_SND1; @@ -113,7 +113,7 @@ static int wsaud_read_header(AVFormatContext *s) st->codec->bit_rate = channels * sample_rate * 4; break; default: - av_log_ask_for_sample(s, "Unknown codec: %d\n", codec); + avpriv_request_sample(s, "Unknown codec: %d", codec); return AVERROR_PATCHWELCOME; } avpriv_set_pts_info(st, 64, 1, sample_rate); |