apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-30 03:20:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'

Browse Source 
* commit '513d849bb605d3d862da1ada709bd2ca1ac68f58':
  mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-30 04:34:43 +01:00
parent 4c55aa8f93 513d849bb6
commit 7f18cb9101
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/mpegvideo.h
-1
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 num_sprite_warping_points;
int real_sprite_warping_points;
uint16_t sprite_traj[4][2]; ///< sprite trajectory points
int sprite_offset[2][2]; ///< sprite offset[isChroma][isMVY]