apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-27 17:51:27 +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/mpeg4video.h
+2
View File
@@ -67,6 +67,8 @@ typedef struct Mpeg4DecContext {
int shape;
int vol_sprite_usage;
int sprite_brightness_change;
int num_sprite_warping_points;
// reversible vlc
int rvlc;
///< could this stream contain resync markers