Update of /cvsroot/audacity/audacity-src/src/import
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1723
Modified Files:
ImportFFmpeg.cpp
Log Message:
Safeguard for some error cases in FFmpeg importer. Also, dump start_time to the
log (still don't know what to do with it...)
Index: ImportFFmpeg.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFFmpeg.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ImportFFmpeg.cpp 12 Jun 2008 09:16:40 -0000 1.11
+++ ImportFFmpeg.cpp 14 Jun 2008 17:17:50 -0000 1.12
@@ -315,6 +315,7 @@
if (mFormatContext->start_time != AV_NOPTS_VALUE)
{
//TODO: handle this situation (generate <start_time> ms of slience?)
+ wxLogMessage(wxT("start_time = %d, that would be %d
milliseconds."),mFormatContext->start_time,(mFormatContext->start_time/AV_TIME_BASE*1000));
wxLogMessage(wxT("start_time support is not implemented in FFmpeg import
plugin. Patches are welcome."));
}
@@ -338,6 +339,7 @@
if (sc->m_stream->start_time != AV_NOPTS_VALUE)
{
//TODO: same as before
+ wxLogMessage(wxT("start_time = %d, that would be %d
milliseconds."),sc->m_stream->start_time,(sc->m_stream->start_time/AV_TIME_BASE*1000));
wxLogMessage(wxT("start_time support is not implemented in FFmpeg
import plugin. Patches are welcome."));
}
@@ -707,7 +709,7 @@
{
if (FFmpegLibsInst->ValidLibsLoaded())
{
- FFmpegLibsInst->av_close_input_file(mFormatContext);
+ if (mFormatContext) FFmpegLibsInst->av_close_input_file(mFormatContext);
FFmpegLibsInst->av_log_set_callback(FFmpegLibsInst->av_log_default_callback);
}
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
