From 1461b515a8830770b430c0bf8ba978c4046ed534 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 14 Nov 2004 18:26:15 +0000 Subject: [PATCH] Use the source packetizers' compressor. For some reason creating a new one doesn't work... --- src/merge/pr_generic.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/merge/pr_generic.cpp b/src/merge/pr_generic.cpp index f29d56a0b..bd12499bb 100644 --- a/src/merge/pr_generic.cpp +++ b/src/merge/pr_generic.cpp @@ -990,15 +990,11 @@ generic_packetizer_c::connect(generic_packetizer_c *src) { htrack_type = src->htrack_type; htrack_default_duration = src->htrack_default_duration; huid = src->huid; - if (hcompression != src->hcompression) { - if (compressor != NULL) { - delete compressor; - compressor = NULL; - } - hcompression = src->hcompression; - if (hcompression != COMPRESSION_NONE) - compressor = compression_c::create(hcompression); - } + if (compressor != NULL) + delete compressor; + hcompression = src->hcompression; + compressor = src->compressor; + src->compressor = NULL; last_cue_timecode = src->last_cue_timecode; correction_timecode_offset = 0; if (htrack_type != track_subtitle)