data parameter of dnxhd_encode_picture() should not be const.

[frescor/ffmpeg.git] / libavformat / ffm.h

diff --git a/libavformat/ffm.h b/libavformat/ffm.h
index ebbf9924800049f6bc4ba3ccd9694e26f769690d..05d6eb1053211c96da7e314c312ed855a2c64e12 100644 (file)
--- a/libavformat/ffm.h
+++ b/libavformat/ffm.h
@@ -1,6 +1,6 @@
 /*
  * FFM (ffserver live feed) common header
- * Copyright (c) 2001 Fabrice Bellard.
+ * Copyright (c) 2001 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -19,18 +19,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_FFM_H
-#define FFMPEG_FFM_H
+#ifndef AVFORMAT_FFM_H
+#define AVFORMAT_FFM_H
 
+#include <stdint.h>
 #include "avformat.h"
+#include "avio.h"
 
 /* The FFM file is made of blocks of fixed size */
 #define FFM_HEADER_SIZE 14
 #define PACKET_ID       0x666d
 
 /* each packet contains frames (which can span several packets */
-#define FRAME_HEADER_SIZE    8
+#define FRAME_HEADER_SIZE    16
 #define FLAG_KEY_FRAME       0x01
+#define FLAG_DTS             0x02
 
 enum {
     READ_HEADER,
@@ -39,19 +42,17 @@ enum {
 
 typedef struct FFMContext {
     /* only reading mode */
-    offset_t write_index, file_size;
+    int64_t write_index, file_size;
     int read_state;
-    uint8_t header[FRAME_HEADER_SIZE];
+    uint8_t header[FRAME_HEADER_SIZE+4];
 
     /* read and write */
     int first_packet; /* true if first packet, needed to set the discontinuity tag */
-    int first_frame_in_packet; /* true if first frame in packet, needed to know if PTS information is valid */
     int packet_size;
     int frame_offset;
-    int64_t pts;
+    int64_t dts;
     uint8_t *packet_ptr, *packet_end;
     uint8_t packet[FFM_PACKET_SIZE];
-    int64_t start_time;
 } FFMContext;
 
-#endif /* FFMPEG_FFM_H */
+#endif /* AVFORMAT_FFM_H */