diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
| commit | cacbf64a76acb69b2efd773e8d7ab01bc957560d (patch) | |
| tree | 80e9d70ed0a266a3540daa5707ff5b71ee2b475f /libavcodec/wmalosslessdec.c | |
| parent | 13795dbb642cecf46e75fb6a78c830bf862c2310 (diff) | |
| parent | 12e25ed284592b32c954d471e9b7b1e5a0dbf18d (diff) | |
| download | ffmpeg-cacbf64a76acb69b2efd773e8d7ab01bc957560d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmalosslessdec.c')
| -rw-r--r-- | libavcodec/wmalosslessdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index e76b73a6d5..90a01098fb 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -886,7 +886,7 @@ static int decode_subframe(WmallDecodeCtx *s) s->do_arith_coding = get_bits1(&s->gb); if (s->do_arith_coding) { - av_log_missing_feature(s->avctx, "Arithmetic coding", 1); + avpriv_request_sample(s->avctx, "Arithmetic coding"); return AVERROR_PATCHWELCOME; } s->do_ac_filter = get_bits1(&s->gb); @@ -1189,7 +1189,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, skip_bits(gb, 1); // Skip seekable_frame_in_packet, currently ununused spliced_packet = get_bits1(gb); if (spliced_packet) - av_log_missing_feature(avctx, "Bitstream splicing", 1); + avpriv_request_sample(avctx, "Bitstream splicing"); /* get number of bits that need to be added to the previous frame */ num_bits_prev_frame = get_bits(gb, s->log2_frame_size); |