diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:26:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:26:17 +0100 |
| commit | c08e523586b6be36bee3f73d609733cd80a57674 (patch) | |
| tree | 5d728f8f5c8647e7ffe3197c25875a1b3dee380d /libavcodec/internal.h | |
| parent | 83e89787984d3f96cb793ebfddc6078d6bc50073 (diff) | |
| parent | 4a0f6651434c6f213d830140f575b4ec7858519f (diff) | |
| download | ffmpeg-c08e523586b6be36bee3f73d609733cd80a57674.tar.gz | |
Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'
* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
libavcodec: when decoding, copy replaygain side data to decoded frames
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 0da2fa4fb7..f5455448a8 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -129,6 +129,8 @@ struct AVCodecDefault { const uint8_t *value; }; +extern const uint8_t ff_log2_run[41]; + /** * Return the hardware accelerated codec for codec codec_id and * pixel format pix_fmt. @@ -251,6 +253,9 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height); int ff_side_data_update_matrix_encoding(AVFrame *frame, enum AVMatrixEncoding matrix_encoding); -extern const uint8_t ff_log2_run[41]; +/** + * Set various frame properties from the codec context / packet data. + */ +int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); #endif /* AVCODEC_INTERNAL_H */ |