diff options
author | jstebbins <[email protected]> | 2012-07-11 20:10:20 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2012-07-11 20:10:20 +0000 |
commit | 8b91bcb733913afea795cfea6178372eee5b4abe (patch) | |
tree | 09b4bd5693f2c361861d803522d2340b6beab985 /libhb/hbffmpeg.h | |
parent | 7f1f338df87f6075e7edf0cd598523acaf0f82a1 (diff) |
bump libav to libav-v0.8-2197-g1a068bf
Resolves several deprecated api's
Eliminates several libav patches
Eliminates our builtin downmix in favour of avresample
Eliminate HB_INPUT_CH_LAYOUT_* and replace with AV_CH_LAYOUT_*
Resolves 6.x and 7.0 input channel layout issues HB had
Adds downmix support to declpcm. We never had it!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4825 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/hbffmpeg.h')
-rw-r--r-- | libhb/hbffmpeg.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libhb/hbffmpeg.h b/libhb/hbffmpeg.h index e4cf63474..138094bc8 100644 --- a/libhb/hbffmpeg.h +++ b/libhb/hbffmpeg.h @@ -14,16 +14,20 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libswscale/swscale.h" +#include "libavresample/avresample.h" #define HB_FFMPEG_THREADS_AUTO (-1) // let hb_avcodec_open decide thread_count void hb_avcodec_init(void); -int hb_avcodec_open( AVCodecContext *, struct AVCodec *, AVDictionary **av_opts, int thread_count ); -int hb_avcodec_close( AVCodecContext * ); +int hb_avcodec_open(AVCodecContext *, AVCodec *, AVDictionary **av_opts, int thread_count); +int hb_avcodec_close(AVCodecContext *); + uint64_t hb_ff_layout_xlat(uint64_t ff_channel_layout, int nchannels); -struct SwsContext* hb_sws_get_context( int srcW, int srcH, - enum PixelFormat srcFormat, int dstW, int dstH, - enum PixelFormat dstFormat, int flags); -void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec); -int hb_ff_dts_disable_xch( AVCodecContext *c ); -int hb_avpicture_fill( AVPicture *pic, hb_buffer_t *buf ); +uint64_t hb_ff_mixdown_xlat(int hb_mixdown, int *downmix_mode); +void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec); + +struct SwsContext* +hb_sws_get_context(int srcW, int srcH, enum PixelFormat srcFormat, + int dstW, int dstH, enum PixelFormat dstFormat, + int flags); +int hb_avpicture_fill(AVPicture *pic, hb_buffer_t *buf); |