diff options
author | Alexis Ballier <aballier@gentoo.org> | 2012-03-01 10:33:19 -0300 |
---|---|---|
committer | elupus <elupus@xbmc.org> | 2012-03-31 16:28:36 +0200 |
commit | e4396ee8a6010c03dca976c8204c29d1da1ec299 (patch) | |
tree | 8524c3d869d2841acf2323dd9182549ffe1298e1 /lib/DllAvFormat.h | |
parent | 45a39f71ac00bbed4bb3fd7c9ed902f7d93900fc (diff) |
Replace av_write_header by avformat_write_header.
The former is gone in libavformat 54.
Diffstat (limited to 'lib/DllAvFormat.h')
-rw-r--r-- | lib/DllAvFormat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h index 3c7f9fa27f..df946ee2b3 100644 --- a/lib/DllAvFormat.h +++ b/lib/DllAvFormat.h @@ -103,7 +103,7 @@ public: int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), offset_t (*seek)(void *opaque, offset_t offset, int whence))=0; - virtual int av_write_header (AVFormatContext *s)=0; + virtual int avformat_write_header (AVFormatContext *s, AVDictionary **options)=0; virtual int av_write_trailer(AVFormatContext *s)=0; virtual int av_write_frame (AVFormatContext *s, AVPacket *pkt)=0; virtual int av_metadata_set2(AVDictionary **pm, const char *key, const char *value, int flags)=0; @@ -167,7 +167,7 @@ public: int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), offset_t (*seek)(void *opaque, offset_t offset, int whence)) { return ::av_alloc_put_byte(buffer, buffer_size, write_flag, opaque, read_packet, write_packet, seek); } - virtual int av_write_header (AVFormatContext *s) { return ::av_write_header (s); } + virtual int avformat_write_header (AVFormatContext *s, AVDictionary **options) { return ::avformat_write_header (s, options); } virtual int av_write_trailer(AVFormatContext *s) { return ::av_write_trailer(s); } virtual int av_write_frame (AVFormatContext *s, AVPacket *pkt) { return ::av_write_frame(s, pkt); } virtual int av_metadata_set2(AVDictionary **pm, const char *key, const char *value, int flags) { return ::av_metadata_set2(pm, key, value, flags); } @@ -230,7 +230,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface int(*p5)(void *opaque, uint8_t *buf, int buf_size), int(*p6)(void *opaque, uint8_t *buf, int buf_size), offset_t(*p7)(void *opaque, offset_t offset, int whence))) - DEFINE_METHOD1(int, av_write_header , (AVFormatContext *p1)) + DEFINE_METHOD2(int, avformat_write_header , (AVFormatContext *p1, AVDictionary **p2)) DEFINE_METHOD1(int, av_write_trailer, (AVFormatContext *p1)) DEFINE_METHOD2(int, av_write_frame , (AVFormatContext *p1, AVPacket *p2)) DEFINE_METHOD4(int, av_metadata_set2, (AVDictionary **p1, const char *p2, const char *p3, int p4)); @@ -270,7 +270,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface RESOLVE_METHOD(av_guess_format) RESOLVE_METHOD(av_set_parameters) RESOLVE_METHOD(av_alloc_put_byte) - RESOLVE_METHOD(av_write_header) + RESOLVE_METHOD(avformat_write_header) RESOLVE_METHOD(av_write_trailer) RESOLVE_METHOD(av_write_frame) RESOLVE_METHOD(av_metadata_set2) |