Changeset 6ed625e in git


Ignore:
Timestamp:
17/06/11 07:33:59 (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:
091069f
Parents:
fed3713
Message:

src/moviemaker.cc: Eliminate use of deprecated function
av_alloc_format_context().

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rfed3713 r6ed625e  
     1Fri Jun 17 06:33:38 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * src/moviemaker.cc: Eliminate use of deprecated function
     4          av_alloc_format_context().
     5
    16Fri Jun 17 06:32:50 GMT 2011  Olly Betts <olly@survex.com>
    27
  • src/moviemaker.cc

    rfed3713 r6ed625e  
    6969#endif
    7070
    71 // ffmpeg CVS has added av_alloc_format_context() - we're ready for it!
    72 #define av_alloc_format_context() \
    73     ((AVFormatContext*)av_mallocz(sizeof(AVFormatContext)))
    74 
    7571const int OUTBUF_SIZE = 200000;
    7672
     
    108104
    109105    // Allocate the output media context.
    110     oc = av_alloc_format_context();
     106    oc = avformat_alloc_context();
    111107    if (!oc) {
    112108        // FIXME : out of memory
     
    367363
    368364        // Free the stream.
    369         free(oc);
    370     }
    371 #endif
    372 }
     365        av_free(oc);
     366    }
     367#endif
     368}
Note: See TracChangeset for help on using the changeset viewer.