virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Nidhi Makhijani 2014-07-20 14:51:38 +05:30 committed by Diego Biurrun
parent 1a583c0c60
commit 9f99a5f1d0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mpegvideo.h
View File

@ -542,7 +542,6 @@ typedef struct MpegEncContext {
/* RV10 specific */ /* RV10 specific */
int rv10_version; ///< RV10 version: 0 or 3 int rv10_version; ///< RV10 version: 0 or 3
int rv10_first_dc_coded[3]; int rv10_first_dc_coded[3];
int orig_width, orig_height;
/* MJPEG specific */ /* MJPEG specific */
struct MJpegContext *mjpeg_ctx; struct MJpegContext *mjpeg_ctx;

13
libavcodec/rv10.c
View File

@ -46,6 +46,7 @@
typedef struct RVDecContext { typedef struct RVDecContext {
MpegEncContext m; MpegEncContext m;
int sub_id; int sub_id;
int orig_width, orig_height;
} RVDecContext; } RVDecContext;
static const uint16_t rv_lum_code[256] = { static const uint16_t rv_lum_code[256] = {
@ -365,8 +366,8 @@ static int rv20_decode_picture_header(RVDecContext *rv)
new_w = 4 * ((uint8_t *) s->avctx->extradata)[6 + 2 * f]; new_w = 4 * ((uint8_t *) s->avctx->extradata)[6 + 2 * f];
new_h = 4 * ((uint8_t *) s->avctx->extradata)[7 + 2 * f]; new_h = 4 * ((uint8_t *) s->avctx->extradata)[7 + 2 * f];
} else { } else {
new_w = s->orig_width; new_w = rv->orig_width;
new_h = s->orig_height; new_h = rv->orig_height;
} }
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,
@ -460,10 +461,10 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->codec_id = avctx->codec_id; s->codec_id = avctx->codec_id;
s->orig_width = rv->orig_width =
s->width = avctx->coded_width; s->width = avctx->coded_width;
s->orig_height = rv->orig_height =
s->height = avctx->coded_height; s->height = avctx->coded_height;
s->h263_long_vectors = ((uint8_t *) avctx->extradata)[3] & 1; s->h263_long_vectors = ((uint8_t *) avctx->extradata)[3] & 1;
rv->sub_id = AV_RB32((uint8_t *) avctx->extradata + 4); rv->sub_id = AV_RB32((uint8_t *) avctx->extradata + 4);