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

Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'

Browse Source 
* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
  lavc: make lmax/lmin into private options of mpegvideo encoders

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-18 19:23:00 +02:00
parent ae6ba2db8f 530c1441fd
commit 25f4e9387d
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/avcodec.h
+6 -6
View File
@@ -2372,19 +2372,19 @@ typedef struct AVCodecContext {
*/
int context_model;
#if FF_API_MPV_OPT
/**
* minimum Lagrange multiplier
* - encoding: Set by user.
* - decoding: unused
* @deprecated use encoder private options instead
*/
attribute_deprecated
int lmin;
/**
* maximum Lagrange multiplier
* - encoding: Set by user.
* - decoding: unused
* @deprecated use encoder private options instead
*/
attribute_deprecated
int lmax;
#endif
/**
* frame skip threshold