aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-06-04 14:11:54 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-06-04 14:11:54 +0000
commitecc31d1d8e8b29103b35cdf2494a3e3aadcfe557 (patch)
tree18c29f9c153acc61ecb666e52ebebc3204cc0c7d /libavformat
parent4d9a577e303bbb4e418ceb1ecc7ff4bcff51ed64 (diff)
downloadffmpeg-ecc31d1d8e8b29103b35cdf2494a3e3aadcfe557.tar.gz
move structs and enums to top of file so they can be used
Originally committed as revision 9205 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpegts.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 02ae1705e7..c59cb0ef85 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -117,6 +117,34 @@ struct MpegTSContext {
MpegTSFilter *pids[NB_PID_MAX];
};
+/* TS stream handling */
+
+enum MpegTSState {
+ MPEGTS_HEADER = 0,
+ MPEGTS_PESHEADER_FILL,
+ MPEGTS_PAYLOAD,
+ MPEGTS_SKIP,
+};
+
+/* enough for PES header + length */
+#define PES_START_SIZE 9
+#define MAX_PES_HEADER_SIZE (9 + 255)
+
+struct PESContext {
+ int pid;
+ int stream_type;
+ MpegTSContext *ts;
+ AVFormatContext *stream;
+ AVStream *st;
+ enum MpegTSState state;
+ /* used to get the format */
+ int data_index;
+ int total_size;
+ int pes_header_size;
+ int64_t pts, dts;
+ uint8_t header[MAX_PES_HEADER_SIZE];
+};
+
/**
* Assembles PES packets out of TS packets, and then calls the "section_cb"
* function when they are complete.
@@ -717,34 +745,6 @@ static void mpegts_scan_pat(MpegTSContext *ts)
pat_scan_cb, ts, 1);
}
-/* TS stream handling */
-
-enum MpegTSState {
- MPEGTS_HEADER = 0,
- MPEGTS_PESHEADER_FILL,
- MPEGTS_PAYLOAD,
- MPEGTS_SKIP,
-};
-
-/* enough for PES header + length */
-#define PES_START_SIZE 9
-#define MAX_PES_HEADER_SIZE (9 + 255)
-
-struct PESContext {
- int pid;
- int stream_type;
- MpegTSContext *ts;
- AVFormatContext *stream;
- AVStream *st;
- enum MpegTSState state;
- /* used to get the format */
- int data_index;
- int total_size;
- int pes_header_size;
- int64_t pts, dts;
- uint8_t header[MAX_PES_HEADER_SIZE];
-};
-
static int64_t get_pts(const uint8_t *p)
{
int64_t pts;