virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'

Browse Source 
* commit '9f0617d2137bb7231b181d74392cd84ef4844cd7':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-29 23:20:19 +01:00
commit cdc21e4abe
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpeg4videodec.c
View File

@ -1803,13 +1803,13 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (ctx->vol_sprite_usage == STATIC_SPRITE ||
ctx->vol_sprite_usage == GMC_SPRITE) {
if (ctx->vol_sprite_usage == STATIC_SPRITE) {
s->sprite_width = get_bits(gb, 13);
skip_bits(gb, 13); // sprite_width
skip_bits1(gb); /* marker */
s->sprite_height = get_bits(gb, 13);
skip_bits(gb, 13); // sprite_height
skip_bits1(gb); /* marker */
s->sprite_left = get_bits(gb, 13);
skip_bits(gb, 13); // sprite_left
skip_bits1(gb); /* marker */
s->sprite_top = get_bits(gb, 13);
skip_bits(gb, 13); // sprite_top
skip_bits1(gb); /* marker */
}
s->num_sprite_warping_points = get_bits(gb, 6);

4
libavcodec/mpegvideo.h
View File

@ -595,10 +595,6 @@ typedef struct MpegEncContext {
uint16_t pb_time; ///< time distance between the last b and p,s,i frame
uint16_t pp_field_time;
uint16_t pb_field_time; ///< like above, just for interlaced
int sprite_width;
int sprite_height;
int sprite_left;
int sprite_top;
int sprite_brightness_change;
int num_sprite_warping_points;
int real_sprite_warping_points;