summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
Diffstat (limited to 'libhb')
-rw-r--r--libhb/decdca.c6
-rw-r--r--libhb/dvd.c1
-rw-r--r--libhb/dvdnav.c1
-rw-r--r--libhb/internal.h3
-rw-r--r--libhb/platform/macosx/encca_aac.c6
-rw-r--r--libhb/stream.c2
-rw-r--r--libhb/update.c1
7 files changed, 14 insertions, 6 deletions
diff --git a/libhb/decdca.c b/libhb/decdca.c
index ec625c5bd..4fe066135 100644
--- a/libhb/decdca.c
+++ b/libhb/decdca.c
@@ -156,6 +156,7 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
hb_audio_t * audio = w->audio;
int i, j, k;
int64_t pts, pos;
+ uint64_t upts, upos;
int num_blocks;
/* Get a frame header if don't have one yet */
@@ -198,7 +199,10 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
}
/* Get the whole frame */
- hb_list_getbytes( pv->list, pv->frame, pv->size, &pts, &pos );
+ hb_list_getbytes( pv->list, pv->frame, pv->size, &upts, &upos );
+ pts = (int64_t)upts;
+ pos = (int64_t)upos;
+
if ( pts != pv->last_buf_pts )
{
pv->last_buf_pts = pts;
diff --git a/libhb/dvd.c b/libhb/dvd.c
index d07ccc61f..2d5fb8c9d 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -9,6 +9,7 @@
#include "dvd.h"
#include "dvdread/ifo_read.h"
+#include "dvdread/ifo_print.h"
#include "dvdread/nav_read.h"
static hb_dvd_t * hb_dvdread_init( char * path );
diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c
index 063498c32..dfe847d8a 100644
--- a/libhb/dvdnav.c
+++ b/libhb/dvdnav.c
@@ -10,6 +10,7 @@
#include "dvdnav/dvdnav.h"
#include "dvdread/ifo_read.h"
+#include "dvdread/ifo_print.h"
#include "dvdread/nav_read.h"
#define DVD_READ_CACHE 1
diff --git a/libhb/internal.h b/libhb/internal.h
index a00142b8f..c68d9fa82 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -189,6 +189,9 @@ void hb_stream_close( hb_stream_t ** );
hb_title_t * hb_stream_title_scan( hb_stream_t *);
int hb_stream_read( hb_stream_t *, hb_buffer_t *);
int hb_stream_seek( hb_stream_t *, float );
+int hb_stream_seek_chapter( hb_stream_t *, int );
+int hb_stream_chapter( hb_stream_t * );
+
void * hb_ffmpeg_context( int codec_param );
void * hb_ffmpeg_avstream( int codec_param );
diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c
index 69b29ec4b..26aff207a 100644
--- a/libhb/platform/macosx/encca_aac.c
+++ b/libhb/platform/macosx/encca_aac.c
@@ -57,7 +57,7 @@ static int readDescr(UInt8 **buffer, int *tag)
}
// based off of mov_read_esds from mov.c in ffmpeg's libavformat
-static long ReadESDSDescExt(void* descExt, UInt8 **buffer, int *size, int versionFlags)
+static long ReadESDSDescExt(void* descExt, UInt8 **buffer, UInt32 *size, int versionFlags)
{
UInt8 *esds = (UInt8 *) descExt;
int tag, len;
@@ -154,7 +154,7 @@ int encCoreAudioInit( hb_work_object_t * w, hb_job_t * job )
// get available bitrates
AudioValueRange *bitrates;
- ssize_t bitrateCounts, n;
+ ssize_t bitrateCounts;
err = AudioConverterGetPropertyInfo( pv->converter, kAudioConverterApplicableEncodeBitRates,
&tmpsiz, NULL);
bitrates = malloc( tmpsiz );
@@ -200,7 +200,7 @@ int encCoreAudioInit( hb_work_object_t * w, hb_job_t * job )
&tmp, w->config->aac.bytes );
// CoreAudio returns a complete ESDS, but we only need
// the DecoderSpecific info.
- UInt8* buffer;
+ UInt8* buffer = NULL;
ReadESDSDescExt(w->config->aac.bytes, &buffer, &tmpsiz, 0);
w->config->aac.length = tmpsiz;
memmove( w->config->aac.bytes, buffer,
diff --git a/libhb/stream.c b/libhb/stream.c
index 92907e1ef..37682b14f 100644
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -1217,7 +1217,7 @@ int hb_stream_seek_chapter( hb_stream_t * stream, int chapter_num )
}
int64_t sum_dur = 0;
- hb_chapter_t *chapter;
+ hb_chapter_t *chapter = NULL;
int i;
for ( i = 0; i < chapter_num; ++i)
{
diff --git a/libhb/update.c b/libhb/update.c
index 89909d34b..9f725237b 100644
--- a/libhb/update.c
+++ b/libhb/update.c
@@ -31,7 +31,6 @@ static void UpdateFunc( void * _data )
hb_update_t * data = (hb_update_t *) _data;
- char* p;
char* const url = HB_PROJECT_URL_APPCAST;
char* const urlz = url + strlen( HB_PROJECT_URL_APPCAST ); /* marks null-term */
char url_host[64];