aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-24 10:23:00 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-24 10:23:00 +0100
commitfc50175ba21f3ee7b600176c62476c3cf1bb06ef (patch)
treeb8015e163fbadb5360f5fc19572b36d34e2a6180 /libavformat
parent7e059c9c5d7885d9c41ddff4449e1b642cb1ec34 (diff)
downloadffmpeg-fc50175ba21f3ee7b600176c62476c3cf1bb06ef.tar.gz
Refuse to mux tta into matroska, the output file is broken.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskaenc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 0e522fec0c..56adaa8568 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -931,6 +931,13 @@ static int mkv_write_header(AVFormatContext *s)
if (!mkv->tracks)
return AVERROR(ENOMEM);
+ for (i = 0; i < s->nb_streams; i++)
+ if (s->streams[i]->codec->codec_id == AV_CODEC_ID_TTA) {
+ av_log(s, AV_LOG_ERROR, "The Matroska muxer does not yet support muxing %s\n",
+ avcodec_get_name(s->streams[i]->codec->codec_id));
+ return AVERROR_PATCHWELCOME;
+ }
+
ebml_header = start_ebml_master(pb, EBML_ID_HEADER, 0);
put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);