* Matroska common data
* Copyright (c) 2003-2004 The ffmpeg Project
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
{"A_REAL/28_8" , CODEC_ID_RA_288},
{"A_REAL/ATRC" , CODEC_ID_ATRAC3},
{"A_REAL/COOK" , CODEC_ID_COOK},
-// {"A_REAL/SIPR" , CODEC_ID_SIPRO},
+ {"A_REAL/SIPR" , CODEC_ID_SIPR},
{"A_TRUEHD" , CODEC_ID_TRUEHD},
{"A_TTA1" , CODEC_ID_TTA},
{"A_VORBIS" , CODEC_ID_VORBIS},
{"A_WAVPACK4" , CODEC_ID_WAVPACK},
{"S_TEXT/UTF8" , CODEC_ID_TEXT},
+ {"S_TEXT/UTF8" , CODEC_ID_SRT},
{"S_TEXT/ASCII" , CODEC_ID_TEXT},
{"S_TEXT/ASS" , CODEC_ID_SSA},
{"S_TEXT/SSA" , CODEC_ID_SSA},
{"S_ASS" , CODEC_ID_SSA},
{"S_SSA" , CODEC_ID_SSA},
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
+ {"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE},
{"V_DIRAC" , CODEC_ID_DIRAC},
{"V_MJPEG" , CODEC_ID_MJPEG},
{"V_SNOW" , CODEC_ID_SNOW},
{"V_THEORA" , CODEC_ID_THEORA},
{"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
+ {"V_VP8" , CODEC_ID_VP8},
{"" , CODEC_ID_NONE}
};
};
const AVMetadataConv ff_mkv_metadata_conv[] = {
- { "ARTIST" , "artist" },
- { "LEAD_PERFORMER", "artist" },
+ { "LEAD_PERFORMER", "performer" },
{ "PART_NUMBER" , "track" },
{ 0 }
};