aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rsodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:41:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:41:34 +0100
commita9ddb624890dd8c334617239793e63d93fbd52ee (patch)
treed1b6919c46a238f1a9c926106cddb0d283badd60 /libavformat/rsodec.c
parentfa92ee821bba1d3c2a497ed22e41927b552856f8 (diff)
parent1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e (diff)
downloadffmpeg-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/rsodec.c')
-rw-r--r--libavformat/rsodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
index aae80a8221..b96421762a 100644
--- a/libavformat/rsodec.c
+++ b/libavformat/rsodec.c
@@ -49,7 +49,7 @@ static int rso_read_header(AVFormatContext *s)
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;
}