diff options
| author | Nidhi Makhijani <nidhimj22@gmail.com> | 2014-07-20 14:51:38 +0530 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-20 05:13:01 -0700 |
| commit | 9f99a5f1d078721a30a76aec27c58805b7b87e58 (patch) | |
| tree | b6c5f26750b74a5cbbd550796ee18ba7e2c7722f /libavcodec | |
| parent | 1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9 (diff) | |
| download | ffmpeg-9f99a5f1d078721a30a76aec27c58805b7b87e58.tar.gz | |
mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 | ||||
| -rw-r--r-- | libavcodec/rv10.c | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 7dd4228c95..33465091a5 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -542,7 +542,6 @@ typedef struct MpegEncContext { /* RV10 specific */ int rv10_version; ///< RV10 version: 0 or 3 int rv10_first_dc_coded[3]; - int orig_width, orig_height; /* MJPEG specific */ struct MJpegContext *mjpeg_ctx; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 0e76f63189..835a1aa332 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -46,6 +46,7 @@ typedef struct RVDecContext { MpegEncContext m; int sub_id; + int orig_width, orig_height; } RVDecContext; 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_h = 4 * ((uint8_t *) s->avctx->extradata)[7 + 2 * f]; } else { - new_w = s->orig_width; - new_h = s->orig_height; + new_w = rv->orig_width; + new_h = rv->orig_height; } if (new_w != s->width || new_h != s->height) { 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->codec_id = avctx->codec_id; - s->orig_width = - s->width = avctx->coded_width; - s->orig_height = - s->height = avctx->coded_height; + rv->orig_width = + s->width = avctx->coded_width; + rv->orig_height = + s->height = avctx->coded_height; s->h263_long_vectors = ((uint8_t *) avctx->extradata)[3] & 1; rv->sub_id = AV_RB32((uint8_t *) avctx->extradata + 4); |