[FFmpeg-cvslog] avformat/mxfenc: Check that the video codec in D-10 is MPEG-2

Michael Niedermayer git at videolan.org
Tue Aug 29 22:17:59 EEST 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Aug 29 02:13:20 2017 +0200| [429f3266c14ac4851da007fcb3461f9acc99cbad] | committer: Michael Niedermayer

avformat/mxfenc: Check that the video codec in D-10 is MPEG-2

Others do not work, but nothing rejects them prior to this patch if the
parameters otherwise match

Reviewed-by: Matthieu Bouron <matthieu.bouron at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/mxfenc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 12fc9abbc6..a07da69b11 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -2101,6 +2101,10 @@ static int mxf_write_header(AVFormatContext *s)
 
             sc->video_bit_rate = st->codecpar->bit_rate;
             if (s->oformat == &ff_mxf_d10_muxer) {
+                if (st->codecpar->codec_id != AV_CODEC_ID_MPEG2VIDEO) {
+                    av_log(s, AV_LOG_ERROR, "error MXF D-10 only support MPEG-2 Video\n");
+                    return AVERROR(EINVAL);
+                }
                 if ((sc->video_bit_rate == 50000000) && (mxf->time_base.den == 25)) {
                     sc->index = 3;
                 } else if ((sc->video_bit_rate == 49999840 || sc->video_bit_rate == 50000000) && (mxf->time_base.den != 25)) {



More information about the ffmpeg-cvslog mailing list