apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-01 13:03:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'

Browse Source 
* commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2':
  mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-06 01:14:46 +01:00
parent 56572787ae e41ff4210a
commit 92e10e34b1
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mpeg4video.h
View File

@@ -83,6 +83,7 @@ typedef struct Mpeg4DecContext {
int new_pred;
int enhancement_type;
int scalability;
int use_intra_dc_vlc;
/* bug workarounds */
int divx_version;