diff options
| author | jbrjake <[email protected]> | 2008-10-15 23:44:38 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2008-10-15 23:44:38 +0000 |
| commit | caad2988777bb1882ede66460edc252a04e40bd6 (patch) | |
| tree | dff22018851ecb65533cb7824566149c2de208c0 /libhb | |
| parent | 8079d10b0c22f7a7270828829286cb9947b8a99d (diff) | |
Bumps libmp4v2 to r21, which fixes that include issue by folding the old 5.5G iPod UUID atom into the library, as well as a typing issue with Linux systems.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1836 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/Jamfile | 2 | ||||
| -rw-r--r-- | libhb/Makefile | 2 | ||||
| -rw-r--r-- | libhb/muxmp4.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libhb/Jamfile b/libhb/Jamfile index 5352265b5..51158b9fd 100644 --- a/libhb/Jamfile +++ b/libhb/Jamfile @@ -7,7 +7,7 @@ SubDir TOP libhb : hbversion.h ; LIBHB_SRC = -ipodutil.cpp common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c +common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c muxmp4.c sync.c stream.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c decavcodec.c encxvid.c muxavi.c enclame.c muxogm.c encvorbis.c dvd.c muxmkv.c deblock.c deinterlace.c diff --git a/libhb/Makefile b/libhb/Makefile index fba6c5d59..858d5b1aa 100644 --- a/libhb/Makefile +++ b/libhb/Makefile @@ -25,7 +25,7 @@ SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c enctheora.c \ update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \ muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \ decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \ - dvd.c ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c decomb.c lang.c + dvd.c deblock.c deinterlace.c denoise.c detelecine.c decomb.c lang.c OTMP = $(SRCS:%.c=%.o) OBJS = $(OTMP:%.cpp=%.o) diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c index 3740caca0..a6ddedf5d 100644 --- a/libhb/muxmp4.c +++ b/libhb/muxmp4.c @@ -218,7 +218,7 @@ static int MP4Init( hb_mux_object_t * m ) if( job->h264_level == 30 || job->ipod_atom) { hb_deep_log( 2, "muxmp4: adding iPod atom"); - AddIPodUUID(m->file, mux_data->track); + MP4AddIPodUUID(m->file, mux_data->track); } m->init_delay = job->config.h264.init_delay; |