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 /libavcodec/mpegvideo.h | |
| 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>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 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; |