mux: mp4: fix MPGV in MP4

modules/demux/mpeg/ps.h

@@ -192,8 +192,12 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id, bloc
             {
                 es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MP4V );
             }
-            else if( i_type == 0x01 ||
-                     i_type == 0x02 )
+            else if( i_type == 0x01 )
+            {
+                es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
+                tk->fmt.i_original_fourcc = VLC_CODEC_MP1V;
+            }
+            else if( i_type == 0x02 )
             {
                 es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
             }

modules/mux/mp4.c

@@ -874,6 +874,12 @@ static bo_t *GetESDS(mp4_stream_t *p_stream)
     case VLC_CODEC_MP4V:
         i_object_type_indication = 0x20;
         break;
+    case VLC_CODEC_MPGV:
+        if(p_stream->fmt.i_original_fourcc == VLC_CODEC_MP1V)
+        {
+            i_object_type_indication = 0x6b;
+            break;
+        }
     case VLC_CODEC_MP2V:
         /* MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */
         i_object_type_indication = 0x65;