OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7722ae3
)
avcodec/brender_pix: stop using deprecated avcodec_set_dimensions
author
Paul B Mahol
<onemda@gmail.com>
Tue, 5 Nov 2013 12:26:58 +0000
(12:26 +0000)
committer
Paul B Mahol
<onemda@gmail.com>
Tue, 5 Nov 2013 12:26:58 +0000
(12:26 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/brender_pix.c
patch
|
blob
|
history
diff --git
a/libavcodec/brender_pix.c
b/libavcodec/brender_pix.c
index
e1f5d48
..
1089a38
100644
(file)
--- a/
libavcodec/brender_pix.c
+++ b/
libavcodec/brender_pix.c
@@
-131,8
+131,8
@@
static int brpix_decode_frame(AVCodecContext *avctx,
if (av_image_check_size(hdr.width, hdr.height, 0, avctx) < 0)
return AVERROR_INVALIDDATA;
- if (
hdr.width != avctx->width || hdr.height != avctx->height
)
-
avcodec_set_dimensions(avctx, hdr.width, hdr.height)
;
+ if (
(ret = ff_set_dimensions(avctx, hdr.width, hdr.height)) < 0
)
+
return ret
;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;