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/vp8.c | |
| parent | 13795dbb642cecf46e75fb6a78c830bf862c2310 (diff) | |
| parent | 12e25ed284592b32c954d471e9b7b1e5a0dbf18d (diff) | |
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/vp8.c')
| -rw-r--r-- | libavcodec/vp8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 7bd1cc9950..ac929d03b4 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -337,7 +337,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) buf_size -= 7; if (hscale || vscale) - av_log_missing_feature(s->avctx, "Upscaling", 1); + avpriv_request_sample(s->avctx, "Upscaling"); s->update_golden = s->update_altref = VP56_FRAME_CURRENT; for (i = 0; i < 4; i++) |