diff options
| author | jstebbins <[email protected]> | 2014-02-20 01:51:45 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-02-20 01:51:45 +0000 |
| commit | 0306771b4a5c09d5bbd5742221eb0bc52103f2c5 (patch) | |
| tree | 3c970115d32d0515840eb8b7bb50b2e8976d8d27 /libhb/stream.c | |
| parent | a7c4a9f9f03cafa63068150a2e483db6ef686718 (diff) | |
libhb: remove a52dec
replace it with libavcodec ac3 decoder
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6049 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/stream.c')
| -rw-r--r-- | libhb/stream.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libhb/stream.c b/libhb/stream.c index aaec4c613..43f155fd4 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -14,7 +14,6 @@ #include "hb.h" #include "hbffmpeg.h" #include "lang.h" -#include "a52dec/a52.h" #include "libbluray/bluray.h" #include "vadxva2.h" @@ -73,7 +72,7 @@ static const stream2codec_t st2codec[256] = { st(0x1b, V, WORK_DECAVCODECV, AV_CODEC_ID_H264, "H.264"), st(0x80, U, HB_ACODEC_FFMPEG, AV_CODEC_ID_PCM_BLURAY, "Digicipher II Video"), - st(0x81, A, HB_ACODEC_AC3, 0, "AC3"), + st(0x81, A, HB_ACODEC_AC3, AV_CODEC_ID_AC3, "AC3"), st(0x82, A, HB_ACODEC_DCA, AV_CODEC_ID_DTS, "DTS"), // 0x83 can be LPCM or BD TrueHD. Set to 'unknown' till we know more. st(0x83, U, HB_ACODEC_LPCM, 0, "LPCM"), @@ -4130,6 +4129,7 @@ static void hb_ts_resolve_pid_types(hb_stream_t *stream) update_ts_streams( stream, pid, HB_SUBSTREAM_BD_AC3, stype, A, &pes_idx ); stream->pes.list[pes_idx].codec = HB_ACODEC_AC3; + stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_AC3; update_ts_streams( stream, pid, HB_SUBSTREAM_BD_TRUEHD, stype, A, &pes_idx ); @@ -5010,7 +5010,6 @@ static void add_ffmpeg_audio(hb_title_t *title, hb_stream_t *stream, int id) case AV_CODEC_ID_AC3: audio->config.in.codec = HB_ACODEC_AC3; - audio->config.in.codec_param = 0; break; case AV_CODEC_ID_DTS: |