Merge branch 'master' into staging

# Conflicts:
#	libmpegts.c

common.h

@@ -75,7 +75,7 @@
 /* NIT */
 /* ETSI TS 101 162 - Temporary Private Use
  * Used for both "Original Network ID" and "Network ID" */
-#define DEFAULT_NID     0xff01
+#define DEFAULT_NID     0xffff
 
 /* Program and Program Element Descriptor Tags */
 #define VIDEO_STREAM_DESCRIPTOR_TAG          0x2

libmpegts.c

@@ -2129,8 +2129,7 @@ int increase_pcr( ts_writer_t *w, int num_packets, int imaginary )
 
     if( !imaginary )
     {
-        // FIXME this is wrong for multiple packets
-        if( w->num_pcrs > w->pcr_list_alloced )
+        if( w->num_pcrs >= w->pcr_list_alloced )
         {
             temp = realloc( w->pcr_list, w->pcr_list_alloced * 2 * sizeof(int64_t) );
             if( !temp )