[SCM] libav/experimental: update SectionCallback and PESCallback typedefs to match functions
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:03:16 UTC 2013
The following commit has been merged in the experimental branch:
commit b474d1f3fa6d951b91962eb0eb26945c25988e5a
Author: Måns Rullgård <mans at mansr.com>
Date: Sun Jul 8 13:42:51 2007 +0000
update SectionCallback and PESCallback typedefs to match functions
Originally committed as revision 9542 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 91958e8..406e5bf 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -43,14 +43,16 @@ enum MpegTSFilterType {
MPEGTS_SECTION,
};
-typedef void PESCallback(void *opaque, const uint8_t *buf, int len, int is_start);
+typedef struct MpegTSFilter MpegTSFilter;
+
+typedef void PESCallback(MpegTSFilter *f, const uint8_t *buf, int len, int is_start);
typedef struct MpegTSPESFilter {
PESCallback *pes_cb;
void *opaque;
} MpegTSPESFilter;
-typedef void SectionCallback(void *opaque, const uint8_t *buf, int len);
+typedef void SectionCallback(MpegTSFilter *f, const uint8_t *buf, int len);
typedef void SetServiceCallback(void *opaque, int ret);
@@ -64,7 +66,7 @@ typedef struct MpegTSSectionFilter {
void *opaque;
} MpegTSSectionFilter;
-typedef struct MpegTSFilter {
+struct MpegTSFilter {
int pid;
int last_cc; /* last cc code (-1 if first packet) */
enum MpegTSFilterType type;
@@ -72,7 +74,7 @@ typedef struct MpegTSFilter {
MpegTSPESFilter pes_filter;
MpegTSSectionFilter section_filter;
} u;
-} MpegTSFilter;
+};
typedef struct MpegTSService {
int running:1;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list