diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 16:55:56 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 16:57:43 +0000 |
| commit | bba2488f074904069e38865654413ec44d35ec24 (patch) | |
| tree | e9a6a7ec8dc52da3901726389f9e7fbb7abf58ce /libavcodec/ffv1.h | |
| parent | 3c110b009b8efd3650f1b8caf31c331ee775f0ee (diff) | |
| parent | 4bb1070c154e49d35805fbcdac9c9e92f702ef96 (diff) | |
| download | ffmpeg-streaming-bba2488f074904069e38865654413ec44d35ec24.zip ffmpeg-streaming-bba2488f074904069e38865654413ec44d35ec24.tar.gz | |
Merge commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96'
* commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96':
ffv1: Explicitly name the coder type
Conflicts:
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/ffv1.h')
| -rw-r--r-- | libavcodec/ffv1.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index b68ed2c..c7fed3f 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -53,6 +53,10 @@ #define MAX_QUANT_TABLES 8 #define MAX_CONTEXT_INPUTS 5 +#define AC_GOLOMB_RICE 0 +#define AC_RANGE_DEFAULT_TAB 1 +#define AC_RANGE_CUSTOM_TAB 2 + typedef struct VlcState { int16_t drift; uint16_t error_sum; |
