diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:48:32 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:48:32 +0400 |
commit | d93cf093f840b9a28481c73d7e421f469f2ca4e7 (patch) | |
tree | 6159a41d2f67277f41953dd72ae349c3e2670155 /libavcodec/internal.h | |
parent | 5e95551199871e5912c7bd498cbcc502d33113aa (diff) | |
parent | 632ad2248e2e5d8cd4b51e6c87c943a38c3da425 (diff) |
Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
lavc: Add an internal wrapper around get_format()
Conflicts:
libavcodec/h264_slice.c
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
-rw-r--r-- | libavcodec/internal.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index f5455448a8..abe9fb93b9 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -254,6 +254,13 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame, enum AVMatrixEncoding matrix_encoding); /** + * Select the (possibly hardware accelerated) pixel format. + * This is a wrapper around AVCodecContext.get_format() and should be used + * instead of calling get_format() directly. + */ +int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt); + +/** * Set various frame properties from the codec context / packet data. */ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); |