# HG changeset patch
# User diego
# Date 1358809517 0
# Node ID 7c91c2a669f40469afa5082a2451db5787ae1223
# Parent  a11fa641a7110d784434dcfd5679b1ad71125bd3
demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one

diff -r a11fa641a711 -r 7c91c2a669f4 libmpdemux/demux_lavf.c
--- a/libmpdemux/demux_lavf.c	Mon Jan 21 23:05:14 2013 +0000
+++ b/libmpdemux/demux_lavf.c	Mon Jan 21 23:05:17 2013 +0000
@@ -433,8 +433,11 @@
         case AVMEDIA_TYPE_SUBTITLE:{
             sh_sub_t* sh_sub;
             char type;
-            if (codec->codec_id == AV_CODEC_ID_TEXT ||
-                codec->codec_id == AV_CODEC_ID_SUBRIP)
+            if (codec->codec_id == AV_CODEC_ID_TEXT
+#if LIBAVUTIL_VERSION_MICRO >= 100
+                || codec->codec_id == AV_CODEC_ID_SUBRIP
+#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
+                )
                 type = 't';
             else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT)
                 type = 'm';
@@ -450,10 +453,10 @@
                 type = 'd';
             else if (codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE)
                 type = 'p';
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100)
+#if LIBAVUTIL_VERSION_MICRO >= 100
             else if (codec->codec_id == AV_CODEC_ID_EIA_608)
                 type = 'c';
-#endif
+#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
             else if(codec->codec_tag == MKTAG('c', '6', '0', '8'))
                 type = 'c';
             else