openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 11:49:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'

Browse Source 
* commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091':
  mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-30 04:29:22 +01:00
commit 4c55aa8f93
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mpeg4video.h
View File

@ -66,6 +66,7 @@ typedef struct Mpeg4DecContext {
int time_increment_bits;
int shape;
int vol_sprite_usage;
int sprite_brightness_change;
// reversible vlc
int rvlc;
///< could this stream contain resync markers

4
libavcodec/mpeg4videodec.c
View File

@ -1824,7 +1824,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
return -1;
}
s->sprite_warping_accuracy = get_bits(gb, 2);
s->sprite_brightness_change = get_bits1(gb);
ctx->sprite_brightness_change = get_bits1(gb);
if (ctx->vol_sprite_usage == STATIC_SPRITE)
skip_bits1(gb); // low_latency_sprite
}
@ -2386,7 +2386,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
ctx->vol_sprite_usage == GMC_SPRITE)) {
if (mpeg4_decode_sprite_trajectory(ctx, gb) < 0)
return AVERROR_INVALIDDATA;
if (s->sprite_brightness_change)
if (ctx->sprite_brightness_change)
av_log(s->avctx, AV_LOG_ERROR,
"sprite_brightness_change not supported\n");
if (ctx->vol_sprite_usage == STATIC_SPRITE)

1
libavcodec/mpegvideo.h
View File

@ -595,7 +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_brightness_change;
int num_sprite_warping_points;
int real_sprite_warping_points;
uint16_t sprite_traj[4][2]; ///< sprite trajectory points