Changeset c648bd1 in git


Ignore:
Timestamp:
23/01/14 11:42:28 (6 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
1c448e1
Parents:
ccb83b7
Message:

src/moviemaker.cc,src/moviemaker.h: Fix to actually build without
libav/ffmpeg.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rccb83b7 rc648bd1  
     1Thu Jan 23 11:42:01 GMT 2014  Olly Betts <olly@survex.com>
     2
     3        * src/moviemaker.cc,src/moviemaker.h: Fix to actually build without
     4          libav/ffmpeg.
     5
    16Thu Jan 23 11:34:30 GMT 2014  Olly Betts <olly@survex.com>
    27
  • src/moviemaker.cc

    rccb83b7 rc648bd1  
    109109    MOVIE_NO_SUITABLE_FORMAT = 1,
    110110    MOVIE_AUDIO_ONLY,
    111     MOVIE_FILENAME_TOO_LONG,
    112     MOVIE_NOT_ENABLED
     111    MOVIE_FILENAME_TOO_LONG
    113112};
    114113
     
    492491}
    493492
     493#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
    494494void
    495495MovieMaker::release()
    496496{
    497 #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
    498497    if (video_st) {
    499498        // Close codec.
     
    528527        oc = NULL;
    529528    }
    530 #endif
    531 }
     529}
     530#endif
    532531
    533532MovieMaker::~MovieMaker()
    534533{
     534#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
    535535    release();
     536#endif
    536537}
    537538
  • src/moviemaker.h

    rccb83b7 rc648bd1  
    4242    SwsContext *sws_ctx;
    4343    int averrno;
    44 #endif
    4544 
    4645    void release();
     46#endif
    4747
    4848public:
Note: See TracChangeset for help on using the changeset viewer.