← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vice/trusty

« back to all changes in this revision

Viewing changes to src/gfxoutputdrv/ffmpeglib.h

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2013-07-28 20:38:23 UTC
  • mfrom: (1.1.10) (9.2.7 sid)
  • Revision ID: package-import@ubuntu.com-20130728203823-1h8s6bcv22oundul
Tags: 2.4.dfsg-1
http://bugs.debian.org/693065
http://bugs.debian.org/693641
http://bugs.debian.org/686400
http://bugs.debian.org/714136
* New upstream release (closes: #693065, #693641).
* Drop vice-ffmpeg.patch , applied upstream.
* Disable architecture specific compilation (closes: #686400, #714136).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gfxoutputdrv/ffmpeglib.h
41
41
#endif
42
42
#endif
43
43
 
 
44
/* backwards compatibility */
 
45
#if LIBAVUTIL_VERSION_MAJOR < 51
 
46
#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
 
47
#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
 
48
/* the win32 check is needed otherwise *nix builds fail */
 
49
#if defined(WIN32) || defined(WATCOM_COMPILE)
 
50
#define av_guess_format guess_format
 
51
#define av_guess_format_t guess_format_t
 
52
#define AV_PKT_FLAG_KEY PKT_FLAG_KEY
 
53
#endif
 
54
#endif
 
55
 
 
56
/* wether this check makes sense for V51 is unclear */
 
57
#if LIBAVFORMAT_VERSION_MAJOR < 51
 
58
#define av_guess_format guess_format
 
59
#define av_guess_format_t guess_format_t
 
60
#endif
 
61
 
 
62
/* wether this check makes sense for V51 is unclear */
 
63
#if LIBAVCODEC_VERSION_MAJOR < 51
 
64
#define AV_PKT_FLAG_KEY PKT_FLAG_KEY
 
65
#endif
 
66
 
44
67
/* generic version function */
45
68
typedef unsigned (*ffmpeg_version_t) (void);
46
69
 
64
87
typedef int (*url_fopen_t) (ByteIOContext**, const char*, int);
65
88
typedef int (*url_fclose_t) (ByteIOContext*);
66
89
typedef void (*dump_format_t) (AVFormatContext *, int, const char*, int);
67
 
typedef AVOutputFormat* (*guess_format_t) (const char*, const char*, const char*);
 
90
typedef AVOutputFormat* (*av_guess_format_t) (const char*, const char*, const char*);
68
91
typedef int (*img_convert_t) (AVPicture*, int, AVPicture*, int, int, int);
69
92
 
70
93
/* avutil functions */
102
125
    url_fopen_t                 p_url_fopen;
103
126
    url_fclose_t                p_url_fclose;
104
127
    dump_format_t               p_dump_format;
105
 
    guess_format_t              p_guess_format;
 
128
    av_guess_format_t           p_av_guess_format;
106
129
#ifndef HAVE_FFMPEG_SWSCALE
107
130
    img_convert_t               p_img_convert;
108
131
#endif