diff options
| author | Tim Redfern <tim@eclectronics.org> | 2014-02-17 13:36:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2014-02-17 13:36:38 +0000 |
| commit | 22e28216336da876e1fd17f380ce42eaf1446769 (patch) | |
| tree | 444dad3dc7e2656992d29f34f7bce31970c122a5 /rotord/src | |
| parent | ae5e8541f6e06e64c28719467cdf366ac57aff31 (diff) | |
chasing indexing error
Diffstat (limited to 'rotord/src')
| -rw-r--r-- | rotord/src/libavwrapper.cpp | 4 | ||||
| -rw-r--r-- | rotord/src/rotor.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rotord/src/libavwrapper.cpp b/rotord/src/libavwrapper.cpp index 4a8315f..6c17537 100644 --- a/rotord/src/libavwrapper.cpp +++ b/rotord/src/libavwrapper.cpp @@ -70,11 +70,11 @@ bool libav::video_decoder::open(const std::string& filename){ FFMS_WriteIndex(idxfile.c_str(),index,&err); cerr<<"FFMS2: created index "<<idxfile<<endl; } - cerr<<"FFMS2: "<<filename<<" cannot be indexed "<<endl; + else cerr<<"FFMS2: "<<filename<<" cannot be indexed "<<endl; } if (index == NULL) { std::cerr<<"ffmpegsource: "<<err.Buffer<<std::endl; - return false; + return false; //temp removal 170214 causes core dump } int trackno = FFMS_GetFirstTrackOfType(index, FFMS_TYPE_VIDEO, &err); if (trackno < 0) { diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index 0053146..08d8734 100644 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -796,7 +796,7 @@ namespace Rotor { if (h>0&&h<721){ Poco::Path path(filename); std::string stub(path.getBaseName()+".proxies/"); - std::string suffix="mp4"; //(path.getExtension()); + std::string suffix="mp4"; //(path.getExtension()); -always have to use mp4 incase of file with no suffix std::string pathto="/"; for (int i=0;i<path.depth();i++){ pathto=pathto+path[i]+"/"; @@ -854,8 +854,8 @@ namespace Rotor { Poco::Logger& logger = Poco::Logger::get(Log_name); logger.error("Video_loader failed to seek frame "+toString(wanted)+" of "+attributes["filename"]->value); - if (image.w>0) return ℑ //just return the previous frame if possible - else return nullptr; + if (image.w>0) return true; //just return the previous frame if possible + else return false; } image.setup_fromRGB(frame.w,frame.h,player.frame->Data[0],player.frame->Linesize[0]-(frame.w*3)); } @@ -930,7 +930,7 @@ namespace Rotor { if (!isLoaded&&isLoadable){ isLoaded=load(media_path+attributes["filename"]->value,frame.h); } - Base_video::output(frame); + return Base_video::output(frame); } //void init_attribute(const string &attr){ // if (attr=="filename") { |