diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:12:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:12:41 +0100 |
| commit | 4cf4da9dc5814aebe8881d93b4a88f593b774448 (patch) | |
| tree | 70a7c6514dd14c1a08e2d0f31d85279961e53504 /libavcodec | |
| parent | 751385fe3f6537b2f9d04d2055d23f49f5196efa (diff) | |
| parent | 5b4797a21db900b7d509660b7a4d49829089b004 (diff) | |
| download | ffmpeg-4cf4da9dc5814aebe8881d93b4a88f593b774448.tar.gz | |
Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'
* commit '5b4797a21db900b7d509660b7a4d49829089b004':
avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/internal.h | 7 | ||||
| -rw-r--r-- | libavcodec/utils.c | 20 |
2 files changed, 27 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 35bfcd4755..8aa0ac101c 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -27,6 +27,7 @@ #include <stdint.h> #include "libavutil/buffer.h" +#include "libavutil/channel_layout.h" #include "libavutil/mathematics.h" #include "libavutil/pixfmt.h" #include "avcodec.h" @@ -238,4 +239,10 @@ const uint8_t *avpriv_find_start_code(const uint8_t *p, */ int ff_set_dimensions(AVCodecContext *s, int width, int height); +/** + * Add or update AV_FRAME_DATA_MATRIXENCODING side data. + */ +int ff_side_data_update_matrix_encoding(AVFrame *frame, + enum AVMatrixEncoding matrix_encoding); + #endif /* AVCODEC_INTERNAL_H */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f6601332ce..2c27e19534 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -252,6 +252,26 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height) return ret; } +int ff_side_data_update_matrix_encoding(AVFrame *frame, + enum AVMatrixEncoding matrix_encoding) +{ + AVFrameSideData *side_data; + enum AVMatrixEncoding *data; + + side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_MATRIXENCODING); + if (!side_data) + side_data = av_frame_new_side_data(frame, AV_FRAME_DATA_MATRIXENCODING, + sizeof(enum AVMatrixEncoding)); + + if (!side_data) + return AVERROR(ENOMEM); + + data = (enum AVMatrixEncoding*)side_data->data; + *data = matrix_encoding; + + return 0; +} + #if HAVE_NEON || ARCH_PPC || HAVE_MMX # define STRIDE_ALIGN 16 #else |