diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 8 |
2 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2007-12-11 Wim Taymans <wim.taymans@collabora.co.uk> + Patch by: Mark Nauwelaerts <manauw skynet be> + + * gst/avi/gstavimux.c: (gst_avi_mux_start_file): + Fix regression in stream numbering. Fixes #502655. + +2007-12-11 Wim Taymans <wim.taymans@collabora.co.uk> + Patch by: Wai-Ming Ho <webregbox at yahoo dot co dot uk> * gst/rtp/gstrtph264pay.c: (gst_rtp_h264_pay_init), diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 09129108..de692a21 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -1398,8 +1398,14 @@ gst_avi_mux_start_file (GstAviMux * avimux) node = node->next; if (!avipad->is_video) { + /* audio stream numbers must start at 1 iff there is a video stream 0; + * request_pad inserts video pad at head of list, so this test suffices */ + if (avimux->video_pads) + avimux->audio_pads++; avipad->tag = g_strdup_printf ("%02uwb", avimux->audio_pads); - avipad->idx_tag = g_strdup_printf ("ix%02u", avimux->audio_pads++); + avipad->idx_tag = g_strdup_printf ("ix%02u", avimux->audio_pads); + if (!avimux->video_pads) + avimux->audio_pads++; } else { avipad->tag = g_strdup_printf ("%02udb", avimux->video_pads); avipad->idx_tag = g_strdup_printf ("ix%02u", avimux->video_pads++); |