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

avcodec: replace uses of deprecated avcodec_set_dimensions()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-09 19:41:05 +02:00
parent 3554c2fafc
commit 398e3a591f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/smvjpegdec.c
View File

@ -153,8 +153,11 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz
/* We shouldn't get here if frames_per_jpeg <= 0 because this was rejected /* We shouldn't get here if frames_per_jpeg <= 0 because this was rejected
in init */ in init */
avcodec_set_dimensions(avctx, mjpeg_data->width, ret = ff_set_dimensions(avctx, mjpeg_data->width, mjpeg_data->height / s->frames_per_jpeg);
mjpeg_data->height / s->frames_per_jpeg); if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Failed to set dimensions\n");
return ret;
}
if (*data_size) { if (*data_size) {
s->picture[1]->extended_data = NULL; s->picture[1]->extended_data = NULL;

13
libavcodec/vc1.c
View File

@ -372,7 +372,11 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo
if (v->res_sprite) { if (v->res_sprite) {
int w = get_bits(gb, 11); int w = get_bits(gb, 11);
int h = get_bits(gb, 11); int h = get_bits(gb, 11);
avcodec_set_dimensions(v->s.avctx, w, h); int ret = ff_set_dimensions(v->s.avctx, w, h);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions %d %d\n", w, h);
return ret;
}
skip_bits(gb, 5); //frame rate skip_bits(gb, 5); //frame rate
v->res_x8 = get_bits1(gb); v->res_x8 = get_bits1(gb);
if (get_bits1(gb)) { // something to do with DC VLC selection if (get_bits1(gb)) { // something to do with DC VLC selection
@ -516,6 +520,7 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
{ {
int i; int i;
int w,h; int w,h;
int ret;
av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32)); av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
v->broken_link = get_bits1(gb); v->broken_link = get_bits1(gb);
@ -545,7 +550,11 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
w = v->max_coded_width; w = v->max_coded_width;
h = v->max_coded_height; h = v->max_coded_height;
} }
avcodec_set_dimensions(avctx, w, h); if ((ret = ff_set_dimensions(avctx, w, h)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions %d %d\n", w, h);
return ret;
}
if (v->extended_mv) if (v->extended_mv)
v->extended_dmv = get_bits1(gb); v->extended_dmv = get_bits1(gb);
if ((v->range_mapy_flag = get_bits1(gb))) { if ((v->range_mapy_flag = get_bits1(gb))) {