virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rv10: stop using deprecated avcodec_set_dimensions

Browse Source
This commit is contained in:
Anton Khirnov 2013-10-27 10:02:26 +01:00
parent e7ea97039d
commit ce9f5b13ed
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/rv10.c
View File

@ -28,6 +28,7 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
#include "error_resilience.h" #include "error_resilience.h"
#include "internal.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "h263.h" #include "h263.h"
@ -358,10 +359,12 @@ static int rv20_decode_picture_header(RVDecContext *rv)
if (new_w != s->width || new_h != s->height) { if (new_w != s->width || new_h != s->height) {
av_log(s->avctx, AV_LOG_DEBUG, av_log(s->avctx, AV_LOG_DEBUG,
"attempting to change resolution to %dx%d\n", new_w, new_h); "attempting to change resolution to %dx%d\n", new_w, new_h);
if (av_image_check_size(new_w, new_h, 0, s->avctx) < 0)
return AVERROR_INVALIDDATA;
ff_MPV_common_end(s); ff_MPV_common_end(s);
avcodec_set_dimensions(s->avctx, new_w, new_h);
ret = ff_set_dimensions(s->avctx, new_w, new_h);
if (ret < 0)
return ret;
s->width = new_w; s->width = new_w;
s->height = new_h; s->height = new_h;
if ((ret = ff_MPV_common_init(s)) < 0) if ((ret = ff_MPV_common_init(s)) < 0)