[FFmpeg-cvslog] Revert "avformat/matroskaenc: write CodecPrivate in WebM"

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Sep 21 18:22:05 2018 -0300| [a068594248b784c97d4423812379ca03c6ce5c54] | committer: James Almer

Revert "avformat/matroskaenc: write CodecPrivate in WebM"

This reverts commit 4755b6e6d194b0a0fb72957cd3dc0eaf7b2375f7.

This change was not necessary. CodecPrivate was being written to WebM
for codecs like AV1 already.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a068594248b784c97d4423812379ca03c6ce5c54
---

 libavformat/matroskaenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index a0e2f426f7..76cb124221 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1429,7 +1429,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
         return AVERROR(EINVAL);
     }
 
-    if (par->codec_id != AV_CODEC_ID_WEBVTT) {
+    if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT) {
         mkv->tracks[i].codecpriv_offset = avio_tell(pb);
         ret = mkv_write_codecprivate(s, pb, par, native_id, qt_id);
         if (ret < 0)