diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 15:56:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:56:29 -0300 |
| commit | 0b79fdeb9a81b8a568c7efea1063352338f4aa5b (patch) | |
| tree | c14421786ae5d10d547e6e37a00d517a22e36856 /libavcodec/internal.h | |
| parent | 400ecd8e4059e0d6c587915bca5e7e11858cca33 (diff) | |
| parent | cbebc3251bc2544b469e0dcb176bc04779d8866c (diff) | |
| download | ffmpeg-streaming-0b79fdeb9a81b8a568c7efea1063352338f4aa5b.zip ffmpeg-streaming-0b79fdeb9a81b8a568c7efea1063352338f4aa5b.tar.gz | |
Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'
* commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c':
lavc: Drop deprecated public symbols
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 f1d5202..e9aad91 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -80,12 +80,10 @@ #define FF_DEFAULT_QUANT_BIAS 999999 #endif -#if !FF_API_QSCALE_TYPE #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 #define FF_QSCALE_TYPE_H264 2 #define FF_QSCALE_TYPE_VP56 3 -#endif #define FF_SANE_NB_CHANNELS 64U |
