From 760ba00524883ff613369b7909044e1c462138a1 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Tue, 11 Dec 2007 16:47:12 +0000 Subject: gst/avi/gstavimux.c: Fix regression in stream numbering. Fixes #502655. Original commit message from CVS: Patch by: Mark Nauwelaerts * gst/avi/gstavimux.c: (gst_avi_mux_start_file): Fix regression in stream numbering. Fixes #502655. --- ChangeLog | 7 +++++++ gst/avi/gstavimux.c | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 281f2fb0..9831641b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-12-11 Wim Taymans + + Patch by: Mark Nauwelaerts + + * gst/avi/gstavimux.c: (gst_avi_mux_start_file): + Fix regression in stream numbering. Fixes #502655. + 2007-12-11 Wim Taymans Patch by: Wai-Ming Ho 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++); -- cgit