ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Aug 16 11:43:48 2020 -0300| [c56d787fe3130593ca6e7851569e4e0d3524af04] | committer: James Almer
avcodec/decode: move the ff_decode_frame_props() prototype to the proper header Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c56d787fe3130593ca6e7851569e4e0d3524af04 --- libavcodec/decode.h | 5 +++++ libavcodec/internal.h | 5 ----- libavcodec/libvpxdec.c | 1 + libavcodec/mmaldec.c | 1 + libavcodec/qtrle.c | 1 + libavcodec/rawdec.c | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/decode.h b/libavcodec/decode.h index 5565346f96..d4e3f5c5b5 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -64,6 +64,11 @@ typedef struct FrameDecodeData { */ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt); +/** + * Set various frame properties from the codec context / packet data. + */ +int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); + /** * Called during avcodec_open2() to initialize avctx->internal->bsf. * The bsf should be freed with av_bsf_free(). diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 1c25aab6b9..5d0e6e7831 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -353,11 +353,6 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame, */ 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); - /** * Add a CPB properties side data to an encoding context. */ diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index eddcea8941..3e320446f8 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "decode.h" #include "internal.h" #include "libvpx.h" #include "profiles.h" diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 547bece576..cd2b263a98 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -34,6 +34,7 @@ #include <stdatomic.h> #include "avcodec.h" +#include "decode.h" #include "hwconfig.h" #include "internal.h" #include "libavutil/avassert.h" diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 52394f5264..6bdde75df4 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -36,6 +36,7 @@ #include <string.h> #include "avcodec.h" +#include "decode.h" #include "bytestream.h" #include "internal.h" diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index a110a690f5..26663cabc2 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "bswapdsp.h" +#include "decode.h" #include "get_bits.h" #include "internal.h" #include "raw.h" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
