diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:39:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:40:09 +0100 |
| commit | f4c28aea38aeda38d233c57fa6e0a2f52e1f5416 (patch) | |
| tree | 700b1cf6444849e4bdc6d96512641c0785a832a9 /libavcodec | |
| parent | 0cea39fdd310caaec96f5fe985fe7fcf8dcf38da (diff) | |
| parent | 8cebc9eaac8631adb23dd1e46c37ad8474139a07 (diff) | |
Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'
* commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07':
mpeg4videodec: remove a write-only variable from MpegEncContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 6d74e62cbc..12101522d9 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1826,7 +1826,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) s->sprite_warping_accuracy = get_bits(gb, 2); s->sprite_brightness_change = get_bits1(gb); if (ctx->vol_sprite_usage == STATIC_SPRITE) - s->low_latency_sprite = get_bits1(gb); + skip_bits1(gb); // low_latency_sprite } // FIXME sadct disable bit if verid!=1 && shape not rect diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9ff90813ec..0b03252cea 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -612,7 +612,6 @@ typedef struct MpegEncContext { int reduced_res_vop; int aspect_ratio_info; //FIXME remove int sprite_warping_accuracy; - int low_latency_sprite; int data_partitioning; ///< data partitioning flag from header int partitioned_frame; ///< is current frame partitioned int low_delay; ///< no reordering needed / has no b-frames |