No longer need FFmpeg parsers

diff --git a/src/transports.c b/src/transports.c
index 553fb4867575960f1e5402938b9a74979ac2f54a..d659111d96e3223ac780304932b4562eba684c44 100644 (file)
--- a/src/transports.c
+++ b/src/transports.c
@@ -60,9 +60,6 @@ static void transport_data_timeout(void *aux);
 static void
 stream_init(th_stream_t *st)
 {
-  AVCodec *c;
-  enum CodecID id;
-
   st->st_cc_valid = 0;
 
   st->st_startcond = 0xffffffff;
@@ -74,32 +71,6 @@ stream_init(th_stream_t *st)
   st->st_pcr_last      = AV_NOPTS_VALUE;
   st->st_pcr_drift     = 0;
   st->st_pcr_recovery_fails = 0;
-  /* Open ffmpeg context and parser */
-
-  switch(st->st_type) {
-  case SCT_MPEG2VIDEO: id = CODEC_ID_MPEG2VIDEO; break;
-  case SCT_MPEG2AUDIO: id = CODEC_ID_MP3;        break;
-  case SCT_H264:       id = CODEC_ID_H264;       break;
-  case SCT_AC3:        id = CODEC_ID_AC3;        break;
-  default:             id = CODEC_ID_NONE;       break;
-  }
-    
-  assert(st->st_ctx == NULL);
-  assert(st->st_parser == NULL);
-
-
-  if(id == CODEC_ID_NONE)
-    return;
-  c = avcodec_find_decoder(id);
-  if(c != NULL) {
-    st->st_ctx = avcodec_alloc_context();
-    pthread_mutex_lock(&ffmpeg_lock);
-    avcodec_open(st->st_ctx, c);
-    pthread_mutex_unlock(&ffmpeg_lock);
-    st->st_parser = av_parser_init(id);
-  } else {
-    abort();
-  }
 }
 
 
@@ -115,20 +86,6 @@ stream_clean(th_stream_t *st)
     st->st_demuxer_fd = -1;
   }
 
-  if(st->st_parser != NULL)
-    av_parser_close(st->st_parser);
-    
-  if(st->st_ctx != NULL) {
-    pthread_mutex_lock(&ffmpeg_lock);
-    avcodec_close(st->st_ctx);
-    pthread_mutex_unlock(&ffmpeg_lock);
-  }
-
-  av_free(st->st_ctx);
-
-  st->st_parser = NULL;
-  st->st_ctx = NULL;
-
   free(st->st_priv);
   st->st_priv = NULL;
 

diff --git a/src/tvhead.h b/src/tvhead.h
index be0f7c153c3f4a6fcfe9ad30d71e28b401a8ff7b..5d824f0f10df08c2d86db6da81cb0b5b2e5e8107 100644 (file)
--- a/src/tvhead.h
+++ b/src/tvhead.h
@@ -435,13 +435,6 @@ typedef struct th_stream {
 
   int st_meta_change;
 
-  /* Codec */
-
-  struct AVCodecContext *st_ctx;
-  struct AVCodecParserContext *st_parser;
-
-
-
   /* CA ID's on this stream */
   struct caid_list st_caids;