Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6510 in orxonox.OLD for branches


Ignore:
Timestamp:
Jan 16, 2006, 4:29:04 PM (19 years ago)
Author:
hdavid
Message:

branches/avi_play: fixed loading

Location:
branches/avi_play/src/lib/graphics/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/avi_play/src/lib/graphics/importer/media_container.cc

    r6486 r6510  
    2525#include "media_container.h"
    2626
     27#include "resource_manager.h"
     28
    2729/* header for debug output */
    2830#include "debug.h"
    … …  
    8284
    8385  // Open video file
    84   if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
    85   {
    86     PRINTF(1)("Could not open %s\n", filename);
     86  if (av_open_input_file(&format_context, ResourceManager::getFullName(filename), NULL, 0, NULL) !=0 )
     87  {
     88    PRINTF(1)("Could not open %s\n", ResourceManager::getFullName(filename));
    8789    return false;
    8890  }
    … …  
    9193  if (av_find_stream_info(format_context) < 0)
    9294  {
    93     PRINTF(1)("Could not find stream information in %s\n", filename);
     95    PRINTF(1)("Could not find stream information in %s\n", ResourceManager::getFullName(filename));
    9496    return false;
    9597  }
    … …  
    100102  if(video_stream == -1)
    101103  {
    102     PRINTF(1)("Could not find a video stream in %s\n", filename);
     104    PRINTF(1)("Could not find a video stream in %s\n", ResourceManager::getFullName(filename));
    103105    return false;
    104106  }
    105107
    106108  // Get a pointer to the codec context for the video stream
    107   // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
    108   // codec_context = &format_context->streams[video_stream]->codec;
    109109  codec_context = format_context->streams[video_stream]->codec;
    110110

  • branches/avi_play/src/lib/graphics/importer/movie_player.cc

    r6486 r6510  
    2525#include "movie_player.h"
    2626
     27#include "resource_manager.h"
     28
    2729// header for debug output
    2830#include "debug.h"
    … …  
    9698
    9799  // Open video file
    98   if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
    99   {
    100     PRINTF(1)("Could not open %s\n", filename);
     100  if (av_open_input_file(&format_context, ResourceManager::getFullName(filename), NULL, 0, NULL) !=0 )
     101  {
     102    PRINTF(1)("Could not open %s\n", ResourceManager::getFullName(filename));
    101103    return false;
    102104  }
    … …  
    105107  if (av_find_stream_info(format_context) < 0)
    106108  {
    107     PRINTF(1)("Could not find stream information in %s\n", filename);
     109    PRINTF(1)("Could not find stream information in %s\n", ResourceManager::getFullName(filename));
    108110    return false;
    109111  }
    … …  
    114116  if(video_stream == -1)
    115117  {
    116     PRINTF(1)("Could not find a video stream in %s\n", filename);
     118    PRINTF(1)("Could not find a video stream in %s\n", ResourceManager::getFullName(filename));
    117119    return false;
    118120  }
Note: See TracChangeset for help on using the changeset viewer.