aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-07 12:03:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 16:51:09 +0200
commitd192ff0ece61f68d91c6bf602273cc1740963b5b (patch)
tree76ae2cca6f2541ac5ffbe928a0028f66333927fb
parent4d1346d46acc3ed035ba028954c4dc86cbb72a9b (diff)
downloadffmpeg-d192ff0ece61f68d91c6bf602273cc1740963b5b.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.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 922410386e..95905a15e0 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -222,6 +222,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) {