← Back to branch summary

~ubuntu-branches/ubuntu/quantal/vice/quantal

« back to all changes in this revision

Viewing changes to src/gfxoutputdrv/ffmpeglib.h

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2006-07-30 19:15:59 UTC
  • mto: (9.1.1 lenny) (1.1.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20060730191559-g31ymd2mk102kzff
Tags: upstream-1.19
Import upstream version 1.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gfxoutputdrv/ffmpeglib.h
30
30
#include "vice.h"
31
31
 
32
32
#if defined (WIN32) && !defined(__GNUC__)
33
 
#undef inline
 
33
/* #undef inline */
34
34
#endif
35
35
 
36
36
#ifdef HAVE_FFMPEG_AVFORMAT_H
48
48
typedef int (*avpicture_fill_t) (AVPicture*, uint8_t*, int, int, int);
49
49
typedef int (*avpicture_get_size_t) (int, int, int);
50
50
typedef int (*img_convert_t) (AVPicture*, int, AVPicture*, int, int, int);
51
 
typedef void (*__av_freep_t) (void**);
 
51
typedef void (*av_free_t) (void**);
 
52
typedef unsigned (*avcodec_version_t) (void);
52
53
 
53
54
/* avformat fucntions */
54
55
typedef void (*av_register_all_t) (void);
55
56
typedef AVStream* (*av_new_stream_t) (AVFormatContext*, int);
56
57
typedef int (*av_set_parameters_t) (AVFormatContext*, AVFormatParameters*);
57
58
typedef int (*av_write_header_t) (AVFormatContext*);
 
59
#if FFMPEG_VERSION_INT==0x000408
58
60
typedef int (*av_write_frame_t) (AVFormatContext*, int, const uint8_t*, int);
 
61
#else
 
62
typedef int (*av_write_frame_t) (AVFormatContext*, AVPacket*);
 
63
#endif
59
64
typedef int (*av_write_trailer_t) (AVFormatContext*);
60
65
typedef int (*url_fopen_t) (ByteIOContext*, const char*, int);
61
66
typedef int (*url_fclose_t) (ByteIOContext*);
71
76
    avpicture_fill_t            p_avpicture_fill;
72
77
    avpicture_get_size_t        p_avpicture_get_size;
73
78
    img_convert_t               p_img_convert;
74
 
    __av_freep_t                p___av_freep;
 
79
    av_free_t                   p_av_free;
75
80
 
76
81
    av_register_all_t           p_av_register_all;
77
82
    av_new_stream_t             p_av_new_stream;