Sérgio M. Basto
4 years ago
parent
588fb34831
commit
df59d86d1a
@ -1,48 +0,0 @@
|
||||
diff --git a/configure b/configure
|
||||
index 51c896e901c5d4bb3ac4408e005380f64fb8f230..78aa11404e414db6168aef920e7e6bdaf5636d7d 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1232,15 +1232,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
|
||||
for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjp2; do
|
||||
cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
|
||||
done
|
||||
+ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"
|
||||
if [ "$SYS" = "WINDOWS" ] ; then
|
||||
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
|
||||
cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"
|
||||
fi
|
||||
if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_close(0);" ; then
|
||||
- if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then
|
||||
+ if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0,0);" ; then
|
||||
gpac="yes"
|
||||
else
|
||||
- echo "Warning: gpac is too old, update to 2007-06-21 UTC or later"
|
||||
+ echo "Warning: gpac is too old, update to v0.8.0 or later"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
diff --git a/output/mp4.c b/output/mp4.c
|
||||
index 944e777113c4919520aeae131b542b9b2e0d3366..200cb33a9a19ae41c74f8b057cea3fdd0daf71af 100644
|
||||
--- a/output/mp4.c
|
||||
+++ b/output/mp4.c
|
||||
@@ -147,7 +147,11 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest
|
||||
{
|
||||
uint32_t mvhd_timescale = gf_isom_get_timescale( p_mp4->p_file );
|
||||
uint64_t tkhd_duration = (uint64_t)( mdhd_duration * ( (double)mvhd_timescale / p_mp4->i_time_res ) );
|
||||
+#if GPAC_VERSION_MAJOR > 8
|
||||
+ gf_isom_append_edit( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL );
|
||||
+#else
|
||||
gf_isom_append_edit_segment( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL );
|
||||
+#endif
|
||||
}
|
||||
gf_isom_sample_del( &sample );
|
||||
|
||||
@@ -233,7 +237,7 @@ static int set_param( hnd_t handle, x264_param_t *p_param )
|
||||
dw *= sar;
|
||||
else
|
||||
dh /= sar;
|
||||
- gf_isom_set_pixel_aspect_ratio( p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, p_param->vui.i_sar_width, p_param->vui.i_sar_height );
|
||||
+ gf_isom_set_pixel_aspect_ratio( p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, p_param->vui.i_sar_width, p_param->vui.i_sar_height, 0 );
|
||||
gf_isom_set_track_layout_info( p_mp4->p_file, p_mp4->i_track, dw, dh, 0, 0, 0 );
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
--- ./configure.orig 2019-03-12 00:41:42.000000000 +0000
|
||||
+++ ./configure 2019-03-12 01:10:12.603640526 +0000
|
||||
@@ -1207,7 +1207,9 @@ fi
|
||||
--- ./configure.orig 2020-11-22 22:49:29.765327990 +0000
|
||||
+++ ./configure 2020-11-23 01:07:38.050590012 +0000
|
||||
@@ -1244,9 +1244,7 @@ fi
|
||||
|
||||
if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
|
||||
gpac="no"
|
||||
GPAC_LIBS="-lgpac_static"
|
||||
- GPAC_LIBS="-lgpac_static"
|
||||
- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
|
||||
+ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjp2; do
|
||||
+ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
|
||||
+ done
|
||||
- cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"
|
||||
+ GPAC_LIBS="$($PKGCONFIG --static --libs gpac)"
|
||||
if [ "$SYS" = "WINDOWS" ] ; then
|
||||
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
|
||||
cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"
|
||||
|
||||
Loading…
Reference in new issue