summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-07-08 13:42:51 +0000
committerMåns Rullgård <mans@mansr.com>2007-07-08 13:42:51 +0000
commitb474d1f3fa6d951b91962eb0eb26945c25988e5a (patch)
treee0ef82e56cacf81671d77637f45d47ff832ccde3 /libavformat
parent3f8cd151a0ea8dfef6b4c1b4cdf05dcdb46de63b (diff)
update SectionCallback and PESCallback typedefs to match functions
Originally committed as revision 9542 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpegts.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 91958e8abf..406e5bfb52 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;