diff options
Diffstat (limited to 'k9author/k9avidecode.h')
| -rw-r--r-- | k9author/k9avidecode.h | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/k9author/k9avidecode.h b/k9author/k9avidecode.h index 81cb90c..dae9a87 100644 --- a/k9author/k9avidecode.h +++ b/k9author/k9avidecode.h @@ -19,6 +19,7 @@ #endif #ifdef NEW_FFMPEG #include <libavformat/avformat.h> +#include <libavutil/avutil.h> #endif @@ -32,10 +33,22 @@ //typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t ); typedef void (*av_register_all_t) (void); typedef int64_t (*av_gettime_t) (void); +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0) +typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **); +#else typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *); +#endif +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0) +typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **); +#else typedef int (*av_find_stream_info_t)(AVFormatContext *); +#endif typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID); +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0) +typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **); +#else typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *); +#endif typedef AVFrame * (*avcodec_alloc_frame_t)(void); typedef int (*avpicture_get_size_t)(int , int , int ); @@ -43,11 +56,19 @@ typedef void * (*av_malloc_t)(unsigned int ); typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int); typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *); +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0) +typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *); +#else typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int ); +#endif typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int); typedef void (*av_free_t)(void *); typedef int (*avcodec_close_t)(AVCodecContext *); +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) +typedef void (*avformat_close_input_t)(AVFormatContext **); +#else typedef void (*av_close_input_file_t)(AVFormatContext *); +#endif typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational ) ; typedef void (*avcodec_flush_buffers_t)(AVCodecContext *); @@ -75,21 +96,41 @@ public: private: av_register_all_t av_register_all; +# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0) + avformat_open_input_t avformat_open_input; +# else av_open_input_file_t av_open_input_file; +# endif +# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0) + avformat_find_stream_info_t avformat_find_stream_info; +# else av_find_stream_info_t av_find_stream_info; +# endif avcodec_find_decoder_t avcodec_find_decoder; +# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0) + avcodec_open2_t avcodec_open2; +# else avcodec_open_t avcodec_open; +# endif avcodec_alloc_frame_t avcodec_alloc_frame; av_seek_frame_t av_seek_frame; avpicture_get_size_t avpicture_get_size; av_malloc_t av_malloc; avpicture_fill_t avpicture_fill; av_read_frame_t av_read_frame; +# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0) + avcodec_decode_video2_t avcodec_decode_video2; +# else avcodec_decode_video_t avcodec_decode_video; +# endif img_convert_t img_convert; av_free_t av_free; avcodec_close_t avcodec_close; +# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) + avformat_close_input_t avformat_close_input; +# else av_close_input_file_t av_close_input_file; +# endif av_rescale_q_t av_rescale_q; av_gettime_t av_gettime; avcodec_flush_buffers_t avcodec_flush_buffers; |