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/filmstripdec.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/filmstripdec.c')
| -rw-r--r-- | libavformat/filmstripdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index aa41fa45c5..1cd1a4837b 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -55,7 +55,7 @@ static int read_header(AVFormatContext *s) st->nb_frames = avio_rb32(pb); if (avio_rb16(pb) != 0) { - av_log_ask_for_sample(s, "unsupported packing method\n"); + avpriv_request_sample(s, "Unsupported packing method"); return AVERROR_PATCHWELCOME; } |