gst/avi/gstavimux.c: Fix regression in stream numbering. Fixes #502655.

Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw skynet be>
* gst/avi/gstavimux.c: (gst_avi_mux_start_file):
Fix regression in stream numbering. Fixes #502655.
This commit is contained in:
Mark Nauwelaerts 2007-12-11 16:47:12 +00:00 committed by Wim Taymans
parent d25053bfa9
commit 760ba00524
2 changed files with 14 additions and 1 deletions

View file

@ -1,3 +1,10 @@
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>

View file

@ -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++);