diff options
| author | James Zern <jzern@google.com> | 2010-10-22 18:09:14 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-10-22 18:09:14 +0000 |
| commit | 2aa72ecccc0610f49d3883e401202e95afc5d2a4 (patch) | |
| tree | c0ec1f3247a5c0c158bfd3b6ed9c00964d890cfa /libavcodec/avcodec.h | |
| parent | f9b4eef457dde49f1297f32a02f443cf9e1bc481 (diff) | |
| download | ffmpeg-2aa72ecccc0610f49d3883e401202e95afc5d2a4.tar.gz | |
Add new -slices option and use it for libvpx and libx264.
Patch by James Zern, jzern google
Originally committed as revision 25551 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4bddbaa4aa..705259ed2a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -31,7 +31,7 @@ #include "libavutil/cpu.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 92 +#define LIBAVCODEC_VERSION_MINOR 93 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -2744,6 +2744,15 @@ typedef struct AVCodecContext { * - decoding: unused */ int lpc_passes; + + /** + * Number of slices. + * Indicates number of picture subdivisions. Used for parallelized + * decoding. + * - encoding: Set by user + * - decoding: unused + */ + int slices; } AVCodecContext; /** |