summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-11-29 17:25:26 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-11-29 17:25:26 +0000
commit4baae51b8b448ed4e74278e0468cac4a61c32abc (patch)
tree88d761f4f9c00bfdf558d73eadb63e12cbc09daf /src
parenteaf8df21d5d84979719d2df1808740cdb5c664d6 (diff)
downloadxine-lib-4baae51b8b448ed4e74278e0468cac4a61c32abc.tar.gz
xine-lib-4baae51b8b448ed4e74278e0468cac4a61c32abc.tar.bz2
no need to dispose the current decoder plugin on stream end, it will be disposed
anyway as soon as a new stream starts or another decoder is needed benefit: the dxr3 video decoder will not close the device after playing the logo and therefore the image will stay on screen CVS patchset: 3389 CVS date: 2002/11/29 17:25:26
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/audio_decoder.c9
-rw-r--r--src/xine-engine/video_decoder.c11
2 files changed, 2 insertions, 18 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index a7258618e..68a93f1a0 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_decoder.c,v 1.89 2002/11/12 18:40:54 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.90 2002/11/29 17:25:26 mroi Exp $
*
*
* functions that implement audio decoding
@@ -96,13 +96,6 @@ void *audio_decoder_loop (void *stream_gen) {
case BUF_CONTROL_END:
- if (stream->audio_decoder_plugin) {
- free_audio_decoder (stream, stream->audio_decoder_plugin);
- stream->audio_decoder_plugin = NULL;
- stream->audio_track_map_entries = 0;
- stream->audio_type = 0;
- }
-
/* wait for video to reach this marker, if necessary */
pthread_mutex_lock (&stream->counter_lock);
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 86ee1b55d..9d3d088c3 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_decoder.c,v 1.110 2002/11/15 00:20:34 miguelfreitas Exp $
+ * $Id: video_decoder.c,v 1.111 2002/11/29 17:25:26 mroi Exp $
*
*/
@@ -136,15 +136,6 @@ void *video_decoder_loop (void *stream_gen) {
case BUF_CONTROL_END:
- if (stream->video_decoder_plugin) {
- free_video_decoder (stream, stream->video_decoder_plugin);
- stream->video_decoder_plugin = NULL;
- }
- if (stream->spu_decoder_plugin) {
- free_spu_decoder (stream, stream->spu_decoder_plugin);
- stream->spu_decoder_plugin = NULL;
- }
-
/* wait for audio to reach this marker, if necessary */
pthread_mutex_lock (&stream->counter_lock);