diff options
author | James Almer <jamrial@gmail.com> | 2017-05-08 13:11:17 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-05-08 14:22:43 -0300 |
commit | f089e02fa2b7716d9fa5228c734e55678437db85 (patch) | |
tree | ff8ec50c447f2e23dadf83535093655d96ebe5e0 /libavcodec/internal.h | |
parent | a47bd5d77e3f1dd8bb3d4ba0955bd7b1323c7d83 (diff) | |
parent | 019ab88a95cb31b698506d90e8ce56695a7f1cc5 (diff) | |
download | ffmpeg-f089e02fa2b7716d9fa5228c734e55678437db85.tar.gz |
Merge commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5'
* commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5':
lavc: add an option for exporting cropping information to the caller
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/internal.h')
-rw-r--r-- | libavcodec/internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 6519528431..64120ea92a 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -58,6 +58,12 @@ * skipped due to the skip_frame setting. */ #define FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM (1 << 3) +/** + * The decoder sets the cropping fields in the output frames manually. + * If this cap is set, the generic code will initialize output frame + * dimensions to coded rather than display values. + */ +#define FF_CODEC_CAP_EXPORTS_CROPPING (1 << 4) #ifdef TRACE # define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) |