diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:24:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:46:51 +0200 |
| commit | f4b05cd8415ad6160900bb00565f9b75e356530e (patch) | |
| tree | a1b89b58a5fd5d3d657d8135169ad39075a891be /libavcodec/avcodec.h | |
| parent | 05b2c998c7bfea642e3541787ab5dd3847e2ba81 (diff) | |
| parent | 5e83d9aced2fc2b2e1360452794c58aba55d497c (diff) | |
Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'
* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
h264: fully support cropping.
Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6aebb4800d..aba3aea0c1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -685,6 +685,11 @@ typedef struct RcOverride{ Note: Not everything is supported yet. */ +/** + * Allow decoders to produce frames with data planes that are not aligned + * to CPU requirements (e.g. due to cropping). + */ +#define CODEC_FLAG_UNALIGNED 0x0001 #define CODEC_FLAG_QSCALE 0x0002 ///< Use fixed qscale. #define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced prediction for H.263. #define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC. |