From 15359610833cd03c44fe47f5d002e643103610ec Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 31 Aug 2015 18:35:46 -0600 Subject: [PATCH 1/1] bunch of small fixes, add msg.txt to about prefs --- cinelerra-5.0/build/Makefile.cinelerra | 3 +- cinelerra-5.0/cinelerra/aboutprefs.C | 78 +++------- cinelerra-5.0/cinelerra/aboutprefs.h | 2 +- cinelerra-5.0/cinelerra/bdcreate.C | 9 +- cinelerra-5.0/cinelerra/dvdcreate.C | 5 +- cinelerra-5.0/cinelerra/ffmpeg.C | 5 +- cinelerra-5.0/cinelerra/formattools.C | 6 +- cinelerra-5.0/cinelerra/record.h | 2 +- cinelerra-5.0/ffmpeg/audio/qt.dfl | 1 + cinelerra-5.0/ffmpeg/video/qt.dfl | 1 + cinelerra-5.0/guicast/bcbitmap.C | 2 + cinelerra-5.0/guicast/bcpixmap.C | 2 + cinelerra-5.0/libzmpeg3/demux.C | 2 +- cinelerra-5.0/msg.txt | 189 +++++++++++++++++++++++++ cinelerra-5.0/thirdparty/Makefile | 2 +- 15 files changed, 239 insertions(+), 70 deletions(-) create mode 100644 cinelerra-5.0/msg.txt diff --git a/cinelerra-5.0/build/Makefile.cinelerra b/cinelerra-5.0/build/Makefile.cinelerra index a46f2182..761f57f2 100644 --- a/cinelerra-5.0/build/Makefile.cinelerra +++ b/cinelerra-5.0/build/Makefile.cinelerra @@ -10,7 +10,6 @@ endif DIRS := \ thirdparty \ - quicktime \ libzmpeg3 \ mpeg2enc \ mplexlo \ @@ -75,7 +74,7 @@ endif rm -f bin/new_db $(MAKE) -C db/utils new_db cp -a db/utils/new_db bin/. - cp -a ffmpeg bin/. + cp -a ffmpeg msg.txt bin/. @if [ ! -f "/cinelerra/media.db" ]; then \ echo "need to run:"; \ echo " mkdir /cinelerra"; \ diff --git a/cinelerra-5.0/cinelerra/aboutprefs.C b/cinelerra-5.0/cinelerra/aboutprefs.C index 5439288b..9304b915 100644 --- a/cinelerra-5.0/cinelerra/aboutprefs.C +++ b/cinelerra-5.0/cinelerra/aboutprefs.C @@ -21,10 +21,10 @@ #include "aboutprefs.h" #include "bcsignals.h" +#include "file.inc" #include "language.h" #include "libzmpeg3.h" #include "mwindow.h" -#include "quicktime.h" #include "theme.h" #include "vframe.h" @@ -37,7 +37,7 @@ AboutPrefs::AboutPrefs(MWindow *mwindow, PreferencesWindow *pwindow) AboutPrefs::~AboutPrefs() { - credits.remove_all_objects(); + about.remove_all_objects(); } void AboutPrefs::create_objects() @@ -78,71 +78,37 @@ void AboutPrefs::create_objects() // char versions[BCTEXTLEN]; // sprintf(versions, -// _("Quicktime version %d.%d.%d\n" -// "Libmpeg3 version %d.%d.%d\n"), -// quicktime_major(), -// quicktime_minor(), -// quicktime_release(), +// _("Libmpeg3 version %d.%d.%d\n"), // mpeg3_major(), // mpeg3_minor(), // mpeg3_release()); // draw_text(x, y, versions); - -// y += get_text_height(MEDIUMFONT) * 3; - set_font(LARGEFONT); - draw_text(x, y, _("Contributors:")); - y += get_text_height(LARGEFONT); - - credits.append(new BC_ListBoxItem("Richard Baverstock")); - credits.append(new BC_ListBoxItem("Karl Bielefeldt")); - credits.append(new BC_ListBoxItem("Kevin Brosius")); - credits.append(new BC_ListBoxItem("Jean-Luc Coulon")); - credits.append(new BC_ListBoxItem("Jean-Michel Poure")); - credits.append(new BC_ListBoxItem("Jerome Cornet")); - credits.append(new BC_ListBoxItem("Pierre Marc Dumuid")); - credits.append(new BC_ListBoxItem("Alex Ferrer")); - credits.append(new BC_ListBoxItem("Gustavo Iñiguez")); - credits.append(new BC_ListBoxItem("Tefan de Konink")); - credits.append(new BC_ListBoxItem("Nathan Kurz")); - credits.append(new BC_ListBoxItem("Greg Mekkes")); - credits.append(new BC_ListBoxItem("Eric Seigne")); - credits.append(new BC_ListBoxItem("Johannes Sixt")); - credits.append(new BC_ListBoxItem("Joe Stewart")); - credits.append(new BC_ListBoxItem("Dan Streetman")); - credits.append(new BC_ListBoxItem("Johannes Sixt")); - credits.append(new BC_ListBoxItem("Mark Taraba")); - credits.append(new BC_ListBoxItem("Andraz Tori")); - credits.append(new BC_ListBoxItem("Jonas Wulff")); -#ifdef X_HAVE_UTF8_STRING - credits.append(new BC_ListBoxItem("Einar Rünkaru")); -#else - credits.append(new BC_ListBoxItem("Einar R\374nkaru")); -#endif - credits.append(new BC_ListBoxItem("Monty Montgomery")); - credits.append(new BC_ListBoxItem("Paolo Rampino")); - credits.append(new BC_ListBoxItem("Petter Reinholdtsen")); - credits.append(new BC_ListBoxItem("Nicola Ferralis")); - credits.append(new BC_ListBoxItem("Michael Collins")); - - BC_ListBox *listbox; - add_subwindow(listbox = new BC_ListBox(x, - y, - 200, - 300, - LISTBOX_TEXT, - &credits, - 0, - 0, - 1)); - y += listbox->get_h() + get_text_height(LARGEFONT) + 10; + char exe_path[BCTEXTLEN], msg_path[BCTEXTLEN]; + get_exe_path(exe_path); + snprintf(msg_path, sizeof(msg_path), "%s/msg.txt", exe_path); + FILE *fp = fopen(msg_path, "r"); + if( fp ) { + set_font(LARGEFONT); + draw_text(x, y, _("About:")); + y += get_text_height(LARGEFONT); + char msg[BCTEXTLEN]; + while( fgets(msg, sizeof(msg), fp) ) + about.append(new BC_ListBoxItem(msg)); + + BC_ListBox *listbox; + add_subwindow(listbox = new BC_ListBox(x, y, 300, 300, + LISTBOX_TEXT, &about, 0, 0, 1)); + y += listbox->get_h() + get_text_height(LARGEFONT) + 10; + } + else + y += 300 + get_text_height(LARGEFONT) + 10; set_font(LARGEFONT); set_color(resources->text_default); draw_text(x, y, _("License:")); y += get_text_height(LARGEFONT); - set_font(MEDIUMFONT); char license3[BCTEXTLEN]; diff --git a/cinelerra-5.0/cinelerra/aboutprefs.h b/cinelerra-5.0/cinelerra/aboutprefs.h index 8e6189da..5cb9c5f7 100644 --- a/cinelerra-5.0/cinelerra/aboutprefs.h +++ b/cinelerra-5.0/cinelerra/aboutprefs.h @@ -34,7 +34,7 @@ public: void create_objects(); - ArrayList credits; + ArrayList about; }; diff --git a/cinelerra-5.0/cinelerra/bdcreate.C b/cinelerra-5.0/cinelerra/bdcreate.C index 86a2a690..f4f907d3 100644 --- a/cinelerra-5.0/cinelerra/bdcreate.C +++ b/cinelerra-5.0/cinelerra/bdcreate.C @@ -137,15 +137,16 @@ int CreateBD_Thread::create_bd_jobs(ArrayList *jobs, char exe_path[BCTEXTLEN]; get_exe_path(exe_path); fprintf(fp,"#!/bin/bash -ex\n"); + fprintf(fp,"PATH=$PATH:%s\n",exe_path); fprintf(fp,"mkdir -p $1/udfs\n"); fprintf(fp,"sz=`du -sb $1/bd.m2ts | sed -e 's/[ \t].*//'`\n"); fprintf(fp,"blks=$((sz/2048 + 4096))\n"); fprintf(fp,"mkudffs $1/bd.udfs $blks\n"); fprintf(fp,"mount -o loop $1/bd.udfs $1/udfs\n"); - fprintf(fp,"%s/bdwrite $1/udfs $1/bd.m2ts\n",exe_path); + fprintf(fp,"bdwrite $1/udfs $1/bd.m2ts\n"); fprintf(fp,"umount $1/udfs\n"); - fprintf(fp,"echo To burn bluray, load blank media and run:\n"); - fprintf(fp,"echo dd if=$1/bd.udfs of=/dev/bd bs=2048000\n"); + fprintf(fp,"echo To burn bluray, load writable media and run:\n"); + fprintf(fp,"echo growisofs -dvd-compat -Z /dev/bd=$1/bd.udfs\n"); fprintf(fp,"\n"); fclose(fp); @@ -402,7 +403,7 @@ void CreateBD_DiskSpace::update() } CreateBD_TmpPath::CreateBD_TmpPath(CreateBD_GUI *gui, int x, int y, int w) - : BC_TextBox(x, y, w, 1, -sizeof(gui->thread->tmp_path), + : BC_TextBox(x, y, w, 1, -(int)sizeof(gui->thread->tmp_path), gui->thread->tmp_path, 1, MEDIUMFONT) { this->gui = gui; diff --git a/cinelerra-5.0/cinelerra/dvdcreate.C b/cinelerra-5.0/cinelerra/dvdcreate.C index ad3a8a20..a9477036 100644 --- a/cinelerra-5.0/cinelerra/dvdcreate.C +++ b/cinelerra-5.0/cinelerra/dvdcreate.C @@ -136,6 +136,9 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList *jobs, fprintf(fp,"#!/bin/bash\n"); fprintf(fp,"echo \"running %s\" $# $*\n", script_filename); fprintf(fp,"\n"); + char exe_path[BCTEXTLEN]; + get_exe_path(exe_path); + fprintf(fp,"PATH=$PATH:%s\n",exe_path); if( !use_ffmpeg ) { fprintf(fp,"mplex -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n"); fprintf(fp,"\n"); @@ -475,7 +478,7 @@ void CreateDVD_DiskSpace::update() } CreateDVD_TmpPath::CreateDVD_TmpPath(CreateDVD_GUI *gui, int x, int y, int w) - : BC_TextBox(x, y, w, 1, -sizeof(gui->thread->tmp_path), + : BC_TextBox(x, y, w, 1, -(int)sizeof(gui->thread->tmp_path), gui->thread->tmp_path, 1, MEDIUMFONT) { this->gui = gui; diff --git a/cinelerra-5.0/cinelerra/ffmpeg.C b/cinelerra-5.0/cinelerra/ffmpeg.C index 89175ff7..92a95802 100644 --- a/cinelerra-5.0/cinelerra/ffmpeg.C +++ b/cinelerra-5.0/cinelerra/ffmpeg.C @@ -1580,6 +1580,9 @@ int FFMPEG::open_encoder(const char *type, const char *spec) } } if( !ret ) { + if( fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER ) + st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; + ret = avcodec_open2(st->codec, codec, &sopts); if( ret < 0 ) { ff_err(ret,"FFMPEG::open_encoder"); @@ -1591,8 +1594,6 @@ int FFMPEG::open_encoder(const char *type, const char *spec) ret = 0; } if( !ret ) { - if( fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER ) - st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; if( fst && bsfilter[0] ) fst->add_bsfilter(bsfilter, !bsargs[0] ? 0 : bsargs); } diff --git a/cinelerra-5.0/cinelerra/formattools.C b/cinelerra-5.0/cinelerra/formattools.C index d72ed4cd..bdc96d4e 100644 --- a/cinelerra-5.0/cinelerra/formattools.C +++ b/cinelerra-5.0/cinelerra/formattools.C @@ -858,10 +858,14 @@ int FormatFFMPEG::load_defaults(const char *path, const char *type, FILE *fp = fopen(default_file,"r"); if( !fp ) return 1; fgets(codec, BCSTRLEN, fp); - fclose(fp); char *cp = codec; while( *cp && *cp!='\n' ) ++cp; *cp = 0; + while( len > 0 && fgets(codec_options, len, fp) ) { + int n = strlen(codec_options); + codec_options += n; len -= n; + } + fclose(fp); FFMPEG::set_option_path(default_file, "%s/%s", path, codec); return FFMPEG::load_options(default_file, codec_options, len); } diff --git a/cinelerra-5.0/cinelerra/record.h b/cinelerra-5.0/cinelerra/record.h index 43d1f8ca..b0275c5e 100644 --- a/cinelerra-5.0/cinelerra/record.h +++ b/cinelerra-5.0/cinelerra/record.h @@ -316,7 +316,7 @@ public: int get_time_format(); int set_record_mode(int value); - int is_behind() { return drop_overrun_frames && behind > 0 ? 1 : 0; } + int is_behind() { return drop_overrun_frames && behind > 1 ? 1 : 0; } int64_t dc_offset[MAXCHANNELS]; int frame_w; diff --git a/cinelerra-5.0/ffmpeg/audio/qt.dfl b/cinelerra-5.0/ffmpeg/audio/qt.dfl index ff748545..090bec6c 100644 --- a/cinelerra-5.0/ffmpeg/audio/qt.dfl +++ b/cinelerra-5.0/ffmpeg/audio/qt.dfl @@ -1 +1,2 @@ mp4.qt +flags -global_header diff --git a/cinelerra-5.0/ffmpeg/video/qt.dfl b/cinelerra-5.0/ffmpeg/video/qt.dfl index ff748545..090bec6c 100644 --- a/cinelerra-5.0/ffmpeg/video/qt.dfl +++ b/cinelerra-5.0/ffmpeg/video/qt.dfl @@ -1 +1,2 @@ mp4.qt +flags -global_header diff --git a/cinelerra-5.0/guicast/bcbitmap.C b/cinelerra-5.0/guicast/bcbitmap.C index 8289c599..c508de5c 100644 --- a/cinelerra-5.0/guicast/bcbitmap.C +++ b/cinelerra-5.0/guicast/bcbitmap.C @@ -319,6 +319,8 @@ int BC_Bitmap::initialize(BC_WindowBase *parent_window, this->parent_window = parent_window; this->top_level = parent_window->top_level; this->xv_portid = resources->use_xvideo ? top_level->xvideo_port_id : -1; + if( w < 1 ) w = 1; + if( h < 1 ) h = 1; this->w = w; this->h = h; this->color_model = color_model; diff --git a/cinelerra-5.0/guicast/bcpixmap.C b/cinelerra-5.0/guicast/bcpixmap.C index b9ed221f..838330e1 100644 --- a/cinelerra-5.0/guicast/bcpixmap.C +++ b/cinelerra-5.0/guicast/bcpixmap.C @@ -169,6 +169,8 @@ void BC_Pixmap::reset() int BC_Pixmap::initialize(BC_WindowBase *parent_window, int w, int h, int mode) { + if( w < 1 ) w = 1; + if( h < 1 ) h = 1; this->w = w; this->h = h; this->parent_window = parent_window; diff --git a/cinelerra-5.0/libzmpeg3/demux.C b/cinelerra-5.0/libzmpeg3/demux.C index ce9f3d05..aed0b037 100644 --- a/cinelerra-5.0/libzmpeg3/demux.C +++ b/cinelerra-5.0/libzmpeg3/demux.C @@ -884,7 +884,7 @@ get_program_pes_packet( uint32_t header) //dmp(&nav->dsi[0],NAV_DSI_BYTES); pes_packet_length -= NAV_DSI_BYTES; int64_t blk_pos = ((int64_t)nav->dsi_gi_pck_lbn() & 0x7fffffffU) * DVD_PACKET_SIZE; - if( last_packet_start != blk_pos ) + if( blk_pos != 0 && last_packet_start != blk_pos ) zmsgs("blk_pos "_LX" != "_LX" last_packet_start\n", blk_pos, last_packet_start); int64_t next_pos, next_vobu, end_byte, end_pos; int64_t blk_size = (int64_t)nav->dsi_gi_vobu_ea() * DVD_PACKET_SIZE; diff --git a/cinelerra-5.0/msg.txt b/cinelerra-5.0/msg.txt new file mode 100644 index 00000000..0d785e5e --- /dev/null +++ b/cinelerra-5.0/msg.txt @@ -0,0 +1,189 @@ +sync to last commit on google_code +fixups for plugins interpolate, c41 +so long, Michael Niedermayer... and thanks for all the fish!!! +fixed for v4l2 captures, add colormodel uyuv +centos build workarounds +add missing ffmpeg encoder flush, bdwrite leaks + fixes +rename to current version +add bluray support, add dialog close fixes, scale fix +add shell menu btns, add manual +repair flickering video encode, bug created last checkin +allow ffmpeg video to resample curr_pos, add bluray format +update internationalization data +disable XftFontClose calls to avoid bug in X +remove russian for now, xlat is incorrect +improve ffmpeg err reporting, fix repeated audio on ffmpeg decode data err, replace ff icon data +clipedit remove vs delete +increase vorbis READ_SIZE, check get_next_page failure +change CINELERRA_VERSION to 5.0 +add main menu ffpeg early probe toggle +setformat set_done in destructor +add single threading lock to init_xft +add warn window +add ffmpeg probe update index rebuild warning +upgrade ffmpeg/x265, guard avcodec_flush_buffers, filebox fixups, remove unused grid widget +add ffmpeg dvd render option, fix undo deadlock, fix a few plugin interface gaffs +add buffer flush to ffmpeg seek, clear loop_session on load replace mode +merge with http://cinelerra.org/git-repo/cinelerra +fixup qt raw formats +add u2b format type, tweak j2k, mjpg. rm raw_gray +mods to ffmpeg default codec param strategy +ffmpeg load_defaults, create default codec file def +merge with http://cinelerra.org/git-repo/cinelerra +improve ffmpeg format selection popup menu, more ffmpeg audio fixes +ffmpeg load_defaults, create default codec file def +mods to ffmpeg default codec param strategy +vorbis bld msgs, ffmpeg one frame/frame flush bug, ffmpeg audio history fixes +several bug fixes and minor feature changes: +vwindow close while playback active +format tools segv in preferences +1 frame video files are stretchable +opengl deadlocks reworked +added kernel version to dmp file +better dialog thread cleanup +nix startup on theme fail, fixes for font init and titler color model +title keyframe fix and font lookup fixes +add more clipping to bccmdl/bcxfer +a few fixes and improvements +Revert "upgrade ffmpeg->2.7, x265->1.7" doesn't work +upgrade ffmpeg->2.7, x265->1.7 +a few vcodec fixes, more to follow +big haircut, minor fixes to ulaw, audio, removed ilace, fileyuv +still more quicktime fixes and upgrades, lame -O3 to -O (that is lame) +more quicktime fixes and upgrades +bunch of quicktime fixes and improvements, a few icons +repair forking bug, closed forker reused +french xlat update from Henri Bauer +new build sys lib ref in esound build +fix quicktime rawaudio +cleanup of quicktime + a few qt fixes, reduce build strength for thirdparty statics +fix blunder in overlayframe +repair break in init_plugins, plugins dir relative, record_video deadlock +repair break in fileac3 create by ffmpeg upgrade +missed the mpeg encoder plugins in the great plugin migration +add ffmpeg opts for for filters, duration. add h264 preset +fix audio frame drop during ffmpeg encode, rework ffmpeg flow control +fixup delete plugin edge cases +ubuntu build cleanup for last mod +revitalize ladspa +add greycstoration plugin, add rgb planar color models, add plugin visibility filters +more suse build mods +centos build tweaks +stop building/installing festival, cleanup +stop building/installing festival +create debuginfo/ strip objs, add proc/maps to dmp file +prevent stop_playback from deadlocking load_filenames +fix problem with openjpeg, add static_libraries to cinelerra/pluggin make +more ffmpeg fileffmpeg work, add some presets, add openjpeg +bug fix for aud/vid asset flag test in ffmpeg encode, add mp3 audio fmt +fixes for file forking +build tweak for ubuntu +rewrite for BC_CModels::transfer (for 16-bit), more gl_wdw delete fixes +push Einar Rünkaru utf-8 clipboard mod from CV +missed build dep for fdk in mpeg2enc +upgrade libvpx, add aac fdk codec, encoder flow ctrl +rework select_asset, get_audio_for_video +rework select_asset for better asset reconfiguration +rework decoder, add more frame sizes +add muxer to ffmpeg encoder logic +dial in centos build, change bc_sync wdw del lock strategy +upgrade thirdparty src, update configure/make files, fixes +delete old libtheora, libvorbis, libogg +upgrade ogg, vorbis, theora. sync subwindow creation +build tweaks for centos +fix static build dep jpeg +rework ffmpeg: added encoder upgraded decoder. numerous minor fixes +repair x_error_handler err msg reporting +added a few buttons to the android remote +missed a file in last mod, add a few cv patches +add dropped piece of locale setup in wtext mod from CV +fix segv in record close, add i386 patches as ifdef +32 bit build fixes, C41 nans, unmask x_errs +more cleanups for mwindow close, nouveau hangs +rework nvidia xdisplay lock hang on closing glx_win 2nd screen +fix nvidia xdisplay lock hang on closing glx_win 2nd screen +fixes for glx sequencing when using Mesa +add android remote control app source +disable fileforking if debug traps enabled +repair to mpeg2enc for mulit-processor use, a few memory init fixups +Nicola Ferralis: remove audiocine driver type +try to repair timezone (again) +add locking for glXCreateWindow, repair mulitple vwindow closing +fix botched tooltip mod, screws up get_screen_w +add android remote control interface +add missing parallel build dep for burn plugin +add sha1sum to identify exe in cinelerra_*.dmp +fix leaked mmap buffers, cuases record webcam problems +cleanup debug prints, fixup videodevice open +upgrade intl lang support using google xlat +fix for yuv422 format decode problems +bug fix for cmodel convert added to c41 in port +change filemov popup err dlg to print, for now +screen/audio capture segv fix +remove load/save defaults from ported realtime plugins +cleanup and speedup for svg overlayer, valgrind cleanup +upgrades and fixes to svg +allow caveat_slow config in glx fb probes +fix for fullscreen, mods to prop up svg +the new normal +upgrade glx interface, fixes major problems with blending +Porter Duff operators for patchbay rendering options +move fader into overlay engine/opengl +fix opengl alpha channel setup problems +fixup filebox to use most recent dir for default +prevent focus_out event from deactivating if cursor in menu +fix textbox problem with formating with seperators +tooltip popups on wrong side if tile windows right +make mediadb access depend on env var BC_USE_COMMECIALS +rework overlayframe, fixes to condition timed_lock, dvd path textbox, cleanup hisogram +fix buffer limit setup for XMLBuffer +restrict xml buffer when shared string, valgrind find fixes +gifubar control +correct strip commands for theme data +add trap path api +add more elaborate trap logging +fix titler bug +add fileyuv.C to the FFMPEG list +add file.C to the FFMPEG list +2 more fixes filexml +yet more bug fixes for filexml and titler +some cleanup on filexml checkin +rework filexml for intl chars, add a few plugin icons +change header paths for libavcodec to local +add missing mjpegtools includes +CV file codec mods + a few fixes +fix some textbox bugs, again fix alpla probs on titler +fixes to tilter for alpha blundering. msg for shmmax err +cleanup missed utf8 refs in textbox rework +theme fixups, add fedora build prereqs +more titler fixup, index_fd fix +titler fixes, add auto font sizing, fix to listbox +some fixes, mostly titler, many more bugs... +cv port, plugins, not tested +merge cv: quicktime,guicast,libmpeg3 add db code +fix typo, add a few file tags +cleanup bak/sav files +add dropped mods in 4.5->4.6 port +fix can't rewind bits layer3 bug +add missed files for icons +revise default icon data +fixed some problems with layer3 read past eob +pulldown menu collapes on fedora without delay on first choice +change sync loss recovery strategy +removed icon bitmap/vframe cache, not useful. +fixed image_size (now big endin) +added feature to delete unwanted plugins +added feature to create customizable plugin icon data +added trap_sigsegv, trap_sigintr to prefs to capture dmp files +fixed bc_toggle int *value==0 segv +avoid race on open with record_fd +fix window create/move/resize offsets in startup probes +add force rebuild to directory depends +yet another attempt to add the previous mod +filesystem balks on bad soft link +fixed misdeclared locker objects in thread dbg code +added gdb segv capture handler in bcsignals +cutads trips up plugin init, remove for now +update icon data, clear awindow listbox on selection +change leading blanks to tabs for lead-in on recipe lines in errant Makefile.in +initial commit diff --git a/cinelerra-5.0/thirdparty/Makefile b/cinelerra-5.0/thirdparty/Makefile index 67451b9c..89d4b5bc 100644 --- a/cinelerra-5.0/thirdparty/Makefile +++ b/cinelerra-5.0/thirdparty/Makefile @@ -94,7 +94,7 @@ esound.cfg_vars+= AUDIOFILE_LIBS="$(call ld_path,audiofile,libaudiofile/.libs)" esound.cfg_params= --enable-shared=no --with-pic esound.ldflags="-lm -lstdc++" faac.cfg_params= --enable-shared=no -faad2.cfg_params= --with-drm --enable-shared=no +faad2.cfg_params= --enable-shared=no fdk.cfg_vars= ./autogen.sh ; fdk.cfg_params= --enable-shared=no fdk.mak_params= ; for f in $(call bld_path,fdk,/lib*/include); do ln -s include `dirname $$$$f`/fdk-aac ; done -- 2.26.2