Changeset eac4514 in git


Ignore:
Timestamp:
18/09/11 13:24:06 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
65ceb41
Parents:
4095cc0
Message:

src/moviemaker.cc: Fix disabling of libavcodec-using code when
libavcodec isn't present.

git-svn-id: file:///home/survex-svn/survex/trunk@3656 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r4095cc0 reac4514  
     1Sun Sep 18 12:23:39 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * src/moviemaker.cc: Fix disabling of libavcodec-using code when
     4          libavcodec isn't present.
     5
    16Sun Sep 18 11:50:06 GMT 2011  Olly Betts <olly@survex.com>
    27
  • src/moviemaker.cc

    r4095cc0 reac4514  
    240240
    241241unsigned char * MovieMaker::GetBuffer() const {
     242#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
    242243    AVCodecContext * c = st->codec;
    243244    return pixels + c->height * c->width * 3;
     245#else
     246    return NULL;
     247#endif
    244248}
    245249
     
    384388MovieMaker::get_error_string() const
    385389{
     390#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
    386391    switch (averrno) {
    387392        case AVERROR_IO:
     
    416421    }
    417422    return "Unknown error";
    418 }
     423#else
     424    return "Movie generation support code not present";
     425#endif
     426}
Note: See TracChangeset for help on using the changeset viewer.