Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'

[ffmpeg] / libavformat / nut.c

diff --git a/libavformat/nut.c b/libavformat/nut.c
index 7e3c83a2916d5bd36b6f4b432d9a0f9b8d261a4d..a266d5279e13234d7aebef108bf620b9b0a47073 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -29,6 +29,7 @@ const AVCodecTag ff_nut_subtitle_tags[] = {
     { AV_CODEC_ID_SSA         , MKTAG('S', 'S', 'A',  0 ) },
     { AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
     { AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
+    { AV_CODEC_ID_DVB_TELETEXT, MKTAG('D', 'V', 'B', 'T') },
     { AV_CODEC_ID_NONE        , 0                         }
 };