From: Michel Verbraak <info@1st-setup.nl>
Date: Thu, 28 Aug 2014 20:44:00 +0000 (+0200)
Subject: Using new libav CODEC_ID values.
X-Git-Tag: v4.1~1477
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8989eb0c9ce12e7461dfc0222d6e623dcd3906fb;p=thirdparty%2Ftvheadend.git

Using new libav CODEC_ID values.

Signed-off-by: Michel Verbraak <info@1st-setup.nl>
---

diff --git a/src/muxer/muxer_libav.c b/src/muxer/muxer_libav.c
index 876dffce5..aeaf6f582 100644
--- a/src/muxer/muxer_libav.c
+++ b/src/muxer/muxer_libav.c
@@ -375,10 +375,10 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
 
     av_init_packet(&packet);
 
-    if(st->codec->codec_id == CODEC_ID_MPEG2VIDEO)
+    if(st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO)
       pkt = pkt_merge_header(pkt);
 
-    if(lm->lm_h264_filter && st->codec->codec_id == CODEC_ID_H264) {
+    if(lm->lm_h264_filter && st->codec->codec_id == AV_CODEC_ID_H264) {
       if(av_bitstream_filter_filter(lm->lm_h264_filter,
 				    st->codec, 
 				    NULL,