diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
| commit | e16665bf72d226b2c87c76a677414b8ef7720d7e (patch) | |
| tree | b68414614d4ce2eecee89185f80a30a039899bb2 /libavformat | |
| parent | 03ac7991286c583c73c8c44c71aeba1265c61cba (diff) | |
| parent | d9dee728b8c50fb6dbff3701e1abcb2eac5895b3 (diff) | |
| download | ffmpeg-e16665bf72d226b2c87c76a677414b8ef7720d7e.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/oma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/oma.c b/libavformat/oma.c index 03dc1e9d8b..f29b16a4d6 100644 --- a/libavformat/oma.c +++ b/libavformat/oma.c @@ -107,7 +107,8 @@ static int oma_read_header(AVFormatContext *s, case OMA_CODECID_ATRAC3: samplerate = srate_tab[(codec_params >> 13) & 7]*100; if (samplerate != 44100) - av_log(s, AV_LOG_ERROR, "Unsupported sample rate, send sample file to developers: %d\n", samplerate); + av_log_ask_for_sample(s, "Unsupported sample rate: %d\n", + samplerate); framesize = (codec_params & 0x3FF) * 8; jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */ |