[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h264.c,1.166,1.167

Loren Merritt CVS lorenm
Sun Dec 11 03:16:23 CET 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv32018

Modified Files:
	h264.c 
Log Message:
recognize some more nal types



Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- h264.c	10 Nov 2005 04:40:49 -0000	1.166
+++ h264.c	11 Dec 2005 02:16:21 -0000	1.167
@@ -155,8 +155,12 @@
 #define NAL_SEI			6
 #define NAL_SPS			7
 #define NAL_PPS			8
-#define NAL_PICTURE_DELIMITER	9
-#define NAL_FILTER_DATA		10
+#define NAL_AUD                 9
+#define NAL_END_SEQUENCE        10
+#define NAL_END_STREAM          11
+#define NAL_FILLER_DATA         12
+#define NAL_SPS_EXT             13
+#define NAL_AUXILIARY_SLICE     19
     uint8_t *rbsp_buffer;
     int rbsp_buffer_size;
 
@@ -7534,9 +7538,12 @@
             decode_picture_parameter_set(h, bit_length);
 
             break;
-        case NAL_PICTURE_DELIMITER:
-            break;
-        case NAL_FILTER_DATA:
+        case NAL_AUD:
+        case NAL_END_SEQUENCE:
+        case NAL_END_STREAM:
+        case NAL_FILLER_DATA:
+        case NAL_SPS_EXT:
+        case NAL_AUXILIARY_SLICE:
             break;
 	default:
 	    av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type);





More information about the ffmpeg-cvslog mailing list