breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'

Browse Source 
* commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6':
  lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-18 14:17:41 +02:00
parent ec8f56efad 66a68ddd1a
commit fc67d937cc
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/avcodec.h
View File

@@ -2321,14 +2321,16 @@ typedef struct AVCodecContext {
*/
int rc_min_rate;
#if FF_API_MPV_OPT
/**
* @deprecated use encoder private options instead
*/
attribute_deprecated
float rc_buffer_aggressivity;
/**
* initial complexity for pass1 ratecontrol
* - encoding: Set by user.
* - decoding: unused
*/
attribute_deprecated
float rc_initial_cplx;
#endif
/**
* Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.