Merge branch 'master' into master

.gitignore

@@ -13,6 +13,7 @@ build-aux
 config.*
 configure
 h264_analyze
+svc_split
 libtool
 m4/libtool.m4
 m4/lt*

Makefile.unix

@@ -16,14 +16,14 @@ BINARIES = h264_analyze
 
 all: libh264bitstream.a $(BINARIES)
 
-h264_slice_data.c: h264_slice_data.in.c process.pl
-	perl process.pl > h264_slice_data.c < h264_slice_data.in.c
+# h264_slice_data.c: h264_slice_data.in.c process.pl
+# 	perl process.pl > h264_slice_data.c < h264_slice_data.in.c
 
-h264_stream.c: h264_stream.in.c process.pl
-	perl process.pl > h264_stream.c < h264_stream.in.c
+# h264_stream.c: h264_stream.in.c process.pl
+# 	perl process.pl > h264_stream.c < h264_stream.in.c
 
-h264_sei.c: h264_sei.in.c process.pl
-	perl process.pl > h264_sei.c < h264_sei.in.c
+# h264_sei.c: h264_sei.in.c process.pl
+# 	perl process.pl > h264_sei.c < h264_sei.in.c
 
 h264_analyze: h264_analyze.o libh264bitstream.a
 	$(LD) $(LDFLAGS) -o h264_analyze h264_analyze.o -L. -lh264bitstream -lm
@@ -48,3 +48,10 @@ dist: clean
 	tar czf ../h264bitstream-$(VERSION).tar.gz h264bitstream-$(VERSION)
 	rm -rf h264bitstream-$(VERSION)
 
+test:
+	./h264_analyze samples/JM_cqm_cabac.264 > tmp1.out
+	diff -u samples/JM_cqm_cabac.out tmp1.out
+	./h264_analyze samples/x264_test.264 > tmp2.out
+	diff -u samples/x264_test.out tmp2.out
+	./h264_analyze samples/riverbed-II-360p-48961.264 > tmp3.out
+	diff -u samples/riverbed-II-360p-48961.out tmp3.out

h264_nal.c

@@ -88,6 +88,7 @@ void h264_free(h264_stream_t* h)
     }
     for ( int i = 0; i < 256; i++ ) { free( h->pps_table[i] ); }
 
+    free(h->pps);
     free(h->aud);
     if(h->seis != NULL)
     {
@@ -101,9 +102,19 @@ void h264_free(h264_stream_t* h)
     free(h->sh);
 
     if (h->sh_svc_ext != NULL) free(h->sh_svc_ext);
-
+
+    if (h->slice_data != NULL)
+    {
+        if (h->slice_data->rbsp_buf != NULL)
+        {
+            free(h->slice_data->rbsp_buf);
+        }
+
+        free(h->slice_data);
+    }
+
     free(h->sps);
-    
+
     free(h->sps_subset->sps);
     free(h->sps_subset->sps_svc_ext);
     free(h->sps_subset);