diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-20 20:32:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-20 20:32:24 +0200 |
| commit | 02e3e3ea51ffba4067cbd8595396ec677af1f694 (patch) | |
| tree | 854f1f6f55c25a8f82b3f76350fed9a7782120f7 | |
| parent | e2842cfe76c92a083c77c3b09427ff3d60e03f99 (diff) | |
| parent | 9f99a5f1d078721a30a76aec27c58805b7b87e58 (diff) | |
| download | ffmpeg-02e3e3ea51ffba4067cbd8595396ec677af1f694.tar.gz | |
Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'
* commit '9f99a5f1d078721a30a76aec27c58805b7b87e58':
mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 48654e622b..2602826704 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -556,7 +556,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 f908a9a13a..be6ca84dc3 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] = { @@ -369,8 +370,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) { AVRational old_aspect = s->avctx->sample_aspect_ratio; @@ -479,10 +480,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); |