diff options
| author | jstebbins <[email protected]> | 2010-09-14 16:38:12 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-09-14 16:38:12 +0000 |
| commit | 50a9b814396811fc33885d70d2798a6c8c1c595e (patch) | |
| tree | 7eee7df15967f65c5ad17e5f2ec33e886afc68ae /libhb | |
| parent | c1a82127fc2d99293cf27d3821d5ab85c93cc4ec (diff) | |
Bump ffmpeg from 22950 to 25082
It's been 5 months since an ffmpeg bump.
One negative is that we loose LATM support.
The LATM patch is just impossible to apply
anymore since ffmpeg dropped support for using
the external faad lib. There are ifdef's in the
code should anyone wish to revert to an earlier
ffmpeg and enable LATM.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3526 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/module.defs | 2 | ||||
| -rw-r--r-- | libhb/stream.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index b4b1964c9..c6fb9dceb 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -89,7 +89,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - a52 avcodec avformat avutil dca dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \ + a52 avcore avcodec avformat avutil dca dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \ ogg samplerate swscale theora vorbis vorbisenc x264 bluray, \ $(CONTRIB.build/)lib/lib$(n).a ) diff --git a/libhb/stream.c b/libhb/stream.c index 733727c08..9166ace41 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -58,7 +58,11 @@ static const stream2codec_t st2codec[256] = { st(0x0e, N, 0, 0, "ISO 13818-1 auxiliary"), st(0x0f, A, HB_ACODEC_MPGA, CODEC_ID_AAC, "ISO 13818-7 AAC Audio"), st(0x10, V, WORK_DECAVCODECV, CODEC_ID_MPEG4, "MPEG4"), +#if defined(OLD_LATM_PATCH) st(0x11, A, HB_ACODEC_MPGA, CODEC_ID_AAC_LATM, "MPEG4 LATM AAC"), +#else + st(0x11, N, 0, 0, "MPEG4 LATM AAC"), +#endif st(0x12, U, 0, 0, "MPEG4 generic"), st(0x14, N, 0, 0, "ISO 13818-6 DSM-CC download"), @@ -2543,6 +2547,7 @@ int hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt, hb_buffer_t *obu ( pkt[10] >> 7 ); ++stream->ts_pcr_in; stream->ts_found_pcr = 1; + stream->ts_flags |= TS_HAS_PCR; } } @@ -2667,7 +2672,7 @@ int hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt, hb_buffer_t *obu return 0; } // if we have a dts use it otherwise use the pts - stream->ts_pcr = pes_timestamp( pes + ( pes[7] & 0x40? 14 : 9 ) ); + stream->ts_pcr = pes_timestamp( pes + ( pes[7] & 0x40?14:9 ) ); ++stream->ts_pcr_in; } } |