diff options
| author | Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> | 2007-04-03 13:52:00 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-04-03 13:52:00 +0000 |
| commit | f87459e419f0ec48295a9d6a9b1626790ec0f75c (patch) | |
| tree | 047b0db9c63ff9e3b030454c241944cee5d7bb49 | |
| parent | 716222db17905c0d069476451b680cd9070a07be (diff) | |
| download | ffmpeg-f87459e419f0ec48295a9d6a9b1626790ec0f75c.tar.gz | |
FF_CODER_TYPE_RAW / RLE / DEFLATE extracted from a patch by Kamil Nowosad
Originally committed as revision 8609 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/utils.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a1166bb895..c8e55de8b4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1568,6 +1568,9 @@ typedef struct AVCodecContext { #define FF_CODER_TYPE_VLC 0 #define FF_CODER_TYPE_AC 1 +#define FF_CODER_TYPE_RAW 2 +#define FF_CODER_TYPE_RLE 3 +#define FF_CODER_TYPE_DEFLATE 4 /** * coder type * - encoding: set by user. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2129c9d154..6170070afb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -636,6 +636,9 @@ static const AVOption options[]={ {"coder", NULL, OFFSET(coder_type), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "coder"}, {"vlc", "variable length coder / huffman coder", 0, FF_OPT_TYPE_CONST, FF_CODER_TYPE_VLC, INT_MIN, INT_MAX, V|E, "coder"}, {"ac", "arithmetic coder", 0, FF_OPT_TYPE_CONST, FF_CODER_TYPE_AC, INT_MIN, INT_MAX, V|E, "coder"}, +{"raw", "raw (no encoding)", 0, FF_OPT_TYPE_CONST, FF_CODER_TYPE_RAW, INT_MIN, INT_MAX, V|E, "coder"}, +{"rle", "run-lenghth coder", 0, FF_OPT_TYPE_CONST, FF_CODER_TYPE_RLE, INT_MIN, INT_MAX, V|E, "coder"}, +{"deflate", "deflate-based coder", 0, FF_OPT_TYPE_CONST, FF_CODER_TYPE_DEFLATE, INT_MIN, INT_MAX, V|E, "coder"}, {"context", "context model", OFFSET(context_model), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"slice_flags", NULL, OFFSET(slice_flags), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, |