Ticket #37833: diff-disable-ffmpeg-gif-support.patch

File diff-disable-ffmpeg-gif-support.patch, 1.1 KB (added by andre.dos.anjos@…, 12 years ago)
  • src/io/cxx/CodecRegistry.cc

    diff --git src/io/cxx/CodecRegistry.cc src/io/cxx/CodecRegistry.cc
    index 8e32d76..1663611 100644
     
    2525#include <boost/filesystem.hpp>
    2626#include <boost/format.hpp>
    2727
     28#include "bob/core/logging.h"
    2829#include "bob/io/CodecRegistry.h"
    2930
    3031#include<iostream>
    void io::CodecRegistry::registerExtension(const std::string& extension, 
    6869    s_extension2description[extension] = description;
    6970  }
    7071  else {
    71     boost::format m("extension already registered: %s");
    72     m % extension;
     72    boost::format m("extension already registered: %s - ignoring second registration with description `%s'");
     73    m % extension % description;
     74    bob::core::error << m.str() << std::endl;
    7375    throw std::runtime_error(m.str());
    7476  }
    7577
  • src/io/cxx/VideoFile.cc

    diff --git src/io/cxx/VideoFile.cc src/io/cxx/VideoFile.cc
    index 3033132..de04728 100644
    static bool register_codec() { 
    260260  static std::string tmp[] = {
    261261    ".bmp",
    262262    ".dpx",
     263    ".gif",
    263264    ".jpeg",
    264265    ".jpg",
    265266    ".jp2",