diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 23:06:05 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 23:08:32 +0300 |
| commit | bfab4308560c277d754c214210758a865fcc7348 (patch) | |
| tree | 609493b886bed4b8a94bf89a6b8cad269224fb3b /libavcodec/internal.h | |
| parent | fb41bad7e051240017bc4cc79c50ea36ac12b96c (diff) | |
| parent | 94eed68ace9f2416af8457fcbf142b175928c06b (diff) | |
Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
lavc: Drop deprecated options moved to private contexts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index e9aad91704..7748f09f54 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -76,9 +76,7 @@ #endif -#if !FF_API_QUANT_BIAS #define FF_DEFAULT_QUANT_BIAS 999999 -#endif #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 |