diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-07 12:03:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 15:56:15 +0200 |
| commit | e173834af8b531b16a5cf367b4ea1f8e1b5fb403 (patch) | |
| tree | 7896c8c7ee03c60e1adfb704adb9a48993c4405b | |
| parent | 63e3a978157987aa9e4d5e004f8e2d45b967ef94 (diff) | |
| download | ffmpeg-e173834af8b531b16a5cf367b4ea1f8e1b5fb403.tar.gz | |
avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.
Found-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 74760883fcb4443d105814ed246b3cf51d7e9dca)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvenc.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 15c9997e6b..9778719a39 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -223,6 +223,18 @@ static int flv_write_header(AVFormatContext *s) avcodec_get_name(enc->codec_id), i); return AVERROR(EINVAL); } + if (enc->codec_id == AV_CODEC_ID_MPEG4 || + enc->codec_id == AV_CODEC_ID_H263) { + int error = enc->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL; + av_log(s, error ? AV_LOG_ERROR : AV_LOG_WARNING, + "Codec %s is not supported in the official FLV specification,\n", avcodec_get_name(enc->codec_id)); + + if (error) { + av_log(s, AV_LOG_ERROR, + "use vstrict=-1 / -strict -1 to use it anyway.\n"); + return AVERROR(EINVAL); + } + } break; case AVMEDIA_TYPE_AUDIO: if (audio_enc) { |