diff options
| -rw-r--r-- | contrib/ffmpeg/module.defs | 12 | ||||
| -rw-r--r-- | libhb/audio_resample.c | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index a6a824fda..54ac675f7 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB)) $(eval $(call import.CONTRIB.defs,FFMPEG)) -FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v0.8-2197-g1a068bf.tar.bz2 +FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v0.8-2551-gc83f44d.tar.bz2 FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = @@ -10,18 +10,15 @@ FFMPEG.CONFIGURE.host = FFMPEG.CONFIGURE.extra = \ --disable-doc \ --disable-bsfs \ - --disable-encoders \ - --disable-vda \ - --disable-vdpau \ --disable-avconv \ --disable-avplay \ --disable-avprobe \ --disable-avserver \ + --disable-avfilter \ --disable-muxers \ --disable-network \ - --disable-vaapi \ - --disable-dxva2 \ - --enable-bzlib \ + --disable-hwaccels \ + --disable-encoders \ --enable-encoder=flac \ --enable-encoder=ac3 \ --enable-encoder=aac \ @@ -30,6 +27,7 @@ FFMPEG.CONFIGURE.extra = \ --enable-encoder=snow \ --enable-gpl \ --enable-zlib \ + --enable-bzlib \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" diff --git a/libhb/audio_resample.c b/libhb/audio_resample.c index 21a831d3e..3f67da87c 100644 --- a/libhb/audio_resample.c +++ b/libhb/audio_resample.c @@ -78,9 +78,6 @@ int hb_audio_resample_update(hb_audio_resample_t *resample, avresample_close(resample->avresample); } - if (av_get_bytes_per_sample(new_sample_fmt) <= 2) - av_opt_set_int(resample->avresample, "internal_sample_fmt", - AV_SAMPLE_FMT_S16P, 0); av_opt_set_int(resample->avresample, "in_sample_fmt", new_sample_fmt, 0); av_opt_set_int(resample->avresample, "in_channel_layout", |