Module: libav Branch: master Commit: d2ef708c95ace2518deffe830a9c439aeb9edd5d
Author: Tudor Suciu <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sun Jun 2 17:49:24 2013 +0200 matroskaenc: Allow VP9 and Opus in webm Bug-Id: 695 Signed-off-by: Anton Khirnov <[email protected]> --- libavformat/matroskaenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f6af0f8..919cdfd 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -670,9 +670,11 @@ static int mkv_write_tracks(AVFormatContext *s) } if (mkv->mode == MODE_WEBM && !(codec->codec_id == AV_CODEC_ID_VP8 || + codec->codec_id == AV_CODEC_ID_VP9 || + codec->codec_id == AV_CODEC_ID_OPUS || codec->codec_id == AV_CODEC_ID_VORBIS)) { av_log(s, AV_LOG_ERROR, - "Only VP8 video and Vorbis audio are supported for WebM.\n"); + "Only VP8 or VP9 video and Vorbis or Opus audio are supported for WebM.\n"); return AVERROR(EINVAL); } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
