[FFmpeg-cvslog] r14131 - in trunk: libavdevice/audio.c libavformat/avformat.h libavformat/mpegts.c

takis subversion
Wed Jul 9 01:20:23 CEST 2008


Author: takis
Date: Wed Jul  9 01:20:22 2008
New Revision: 14131

Log:
One bit fields should probably be unsigned. Unfortunately, it is left up to the compiler on how one bit fields are treated. gcc treats one bit fields as signed and allows for the 
-funsigned-field parameter. Other compilers (like Sun C) treat one bit fields as unsigned no matter what.
Patch by Erik Hovland erik hovland org


Modified:
   trunk/libavdevice/audio.c
   trunk/libavformat/avformat.h
   trunk/libavformat/mpegts.c

Modified: trunk/libavdevice/audio.c
==============================================================================
--- trunk/libavdevice/audio.c	(original)
+++ trunk/libavdevice/audio.c	Wed Jul  9 01:20:22 2008
@@ -47,7 +47,7 @@ typedef struct {
     int channels;
     int frame_size; /* in bytes ! */
     int codec_id;
-    int flip_left : 1;
+    unsigned int flip_left : 1;
     uint8_t buffer[AUDIO_BLOCK_SIZE];
     int buffer_ptr;
 } AudioData;

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	(original)
+++ trunk/libavformat/avformat.h	Wed Jul  9 01:20:22 2008
@@ -160,13 +160,13 @@ typedef struct AVFormatParameters {
     enum PixelFormat pix_fmt;
     int channel; /**< used to select dv channel */
     const char *standard; /**< tv standard, NTSC, PAL, SECAM */
-    int mpeg2ts_raw:1;  /**< force raw MPEG2 transport stream output, if possible */
-    int mpeg2ts_compute_pcr:1; /**< compute exact PCR for each transport
-                                  stream packet (only meaningful if
-                                  mpeg2ts_raw is TRUE) */
-    int initial_pause:1;       /**< do not begin to play the stream
-                                  immediately (RTSP only) */
-    int prealloced_context:1;
+    unsigned int mpeg2ts_raw:1;  /**< force raw MPEG2 transport stream output, if possible */
+    unsigned int mpeg2ts_compute_pcr:1; /**< compute exact PCR for each transport
+                                            stream packet (only meaningful if
+                                            mpeg2ts_raw is TRUE) */
+    unsigned int initial_pause:1;       /**< do not begin to play the stream
+                                            immediately (RTSP only) */
+    unsigned int prealloced_context:1;
 #if LIBAVFORMAT_VERSION_INT < (53<<16)
     enum CodecID video_codec_id;
     enum CodecID audio_codec_id;

Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c	(original)
+++ trunk/libavformat/mpegts.c	Wed Jul  9 01:20:22 2008
@@ -63,8 +63,8 @@ typedef struct MpegTSSectionFilter {
     int section_index;
     int section_h_size;
     uint8_t *section_buf;
-    int check_crc:1;
-    int end_of_section_reached:1;
+    unsigned int check_crc:1;
+    unsigned int end_of_section_reached:1;
     SectionCallback *section_cb;
     void *opaque;
 } MpegTSSectionFilter;




More information about the ffmpeg-cvslog mailing list