Only use one mdct window size in atrac1.

[ffmpeg] / libavformat / nut.h

diff --git a/libavformat/nut.h b/libavformat/nut.h
index 6acebc34b7402531c91c7f1bc5cc033b0350dc05..a1081ed34cbed5903d1df7f68e0473e8d6740b05 100644 (file)
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_NUT_H
-#define FFMPEG_NUT_H
+#ifndef AVFORMAT_NUT_H
+#define AVFORMAT_NUT_H
 
 //#include <limits.h>
 //#include "libavutil/adler32.h"
@@ -50,14 +50,14 @@ typedef enum{
     FLAG_MATCH_TIME =2048, ///<If set, match_time_delta is coded in the frame header
     FLAG_CODED      =4096, ///<if set, coded_flags are stored in the frame header
     FLAG_INVALID    =8192, ///<if set, frame_code is invalid
-}flag_t;
+} Flag;
 
 typedef struct {
     uint64_t pos;
     uint64_t back_ptr;
 //    uint64_t global_key_pts;
     int64_t ts;
-} syncpoint_t;
+} Syncpoint;
 
 typedef struct {
     uint16_t flags;
@@ -67,7 +67,7 @@ typedef struct {
     int16_t  pts_delta;
     uint8_t  reserved_count;
     uint8_t  header_idx;
-} FrameCode; // maybe s/FrameCode/framecode_t/ or change all to Java style but do not mix
+} FrameCode;
 
 typedef struct {
     int last_flags;
@@ -78,7 +78,7 @@ typedef struct {
     int msb_pts_shift;
     int max_pts_distance;
     int decode_delay; //FIXME duplicate of has_b_frames
-} StreamContext;// maybe s/StreamContext/streamcontext_t/
+} StreamContext;
 
 typedef struct {
     AVFormatContext *avf;
@@ -106,10 +106,10 @@ typedef struct {
 
 void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val);
 int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
-int ff_nut_sp_pos_cmp(syncpoint_t *a, syncpoint_t *b);
-int ff_nut_sp_pts_cmp(syncpoint_t *a, syncpoint_t *b);
+int ff_nut_sp_pos_cmp(Syncpoint *a, Syncpoint *b);
+int ff_nut_sp_pts_cmp(Syncpoint *a, Syncpoint *b);
 void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
 
 extern const Dispositions ff_nut_dispositions[];
 
-#endif /* FFMPEG_NUT_H */
+#endif /* AVFORMAT_NUT_H */