1 From e9236f6fe3fae1ad4a3a2b6b63db493b083f0b21 Mon Sep 17 00:00:00 2001
2 From: Cory Fields <theuni-nospam-@xbmc.org>
3 Date: Mon, 28 Jun 2010 02:10:50 -0400
4 Subject: [PATCH 04/13] added: Ticket #7187, TV Teletext support for DVB EBU
7 Patch part of the XBMC patch set for ffmpeg, downloaded from
8 https://github.com/xbmc/FFmpeg/.
10 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
11 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13 libavcodec/avcodec.h | 4 ++++
14 libavformat/mpegts.c | 2 ++
15 2 files changed, 6 insertions(+)
17 diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
18 index dabae1b..dd6ef3f 100644
19 --- a/libavcodec/avcodec.h
20 +++ b/libavcodec/avcodec.h
21 @@ -520,6 +520,10 @@ enum AVCodecID {
22 AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'),
23 AV_CODEC_ID_ASS = MKBETAG('A','S','S',' '), ///< ASS as defined in Matroska
26 + AV_CODEC_ID_VBI_DATA= 0x17500,
27 + AV_CODEC_ID_VBI_TELETEXT,
29 /* other specific kind of codecs (generally used for attachments) */
30 AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
31 AV_CODEC_ID_TTF = 0x18000,
32 diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
33 index 97da0a3..5dd28f1 100644
34 --- a/libavformat/mpegts.c
35 +++ b/libavformat/mpegts.c
36 @@ -729,6 +729,8 @@ static const StreamType DESC_types[] = {
37 { 0x7b, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
38 { 0x56, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT },
39 { 0x59, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */
40 + { 0x45, AVMEDIA_TYPE_DATA, AV_CODEC_ID_VBI_DATA }, /* VBI Data descriptor */
41 + { 0x46, AVMEDIA_TYPE_DATA, AV_CODEC_ID_VBI_TELETEXT }, /* VBI Teletext descriptor */