avio_wb32(pb, data_size + 11);
}
+static int unsupported_codec(AVFormatContext *s,
+ const char* type, int codec_id)
+{
+ const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id);
+ av_log(s, AV_LOG_ERROR,
+ "%s codec %s not compatible with flv\n",
+ type,
+ desc ? desc->name : "unknown");
+ return AVERROR(ENOSYS);
+}
+
static int flv_write_header(AVFormatContext *s)
{
int i;
return AVERROR(EINVAL);
}
flv->video_enc = enc;
- if (enc->codec_tag == 0) {
- av_log(s, AV_LOG_ERROR, "Video codec '%s' for stream %d is not compatible with FLV\n",
- avcodec_get_name(enc->codec_id), i);
- return AVERROR(EINVAL);
- }
+ if (!ff_codec_get_tag(flv_video_codec_ids, enc->codec_id))
+ return unsupported_codec(s, "Video", enc->codec_id);
+
if (enc->codec_id == AV_CODEC_ID_MPEG4 ||
enc->codec_id == AV_CODEC_ID_H263) {
int error = s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL;
}
flv->audio_enc = enc;
if (get_audio_flags(s, enc) < 0)
- return AVERROR_INVALIDDATA;
+ return unsupported_codec(s, "Audio", enc->codec_id);
if (enc->codec_id == AV_CODEC_ID_PCM_S16BE)
av_log(s, AV_LOG_WARNING,
"16-bit big-endian audio in flv is valid but most likely unplayable (hardware dependent); use s16le\n");
break;
case AVMEDIA_TYPE_DATA:
- if (enc->codec_id != AV_CODEC_ID_TEXT && enc->codec_id != AV_CODEC_ID_NONE) {
- av_log(s, AV_LOG_ERROR, "Data codec '%s' for stream %d is not compatible with FLV\n",
- avcodec_get_name(enc->codec_id), i);
- return AVERROR_INVALIDDATA;
- }
+ if (enc->codec_id != AV_CODEC_ID_TEXT && enc->codec_id != AV_CODEC_ID_NONE)
+ return unsupported_codec(s, "Data", enc->codec_id);
flv->data_enc = enc;
break;
case AVMEDIA_TYPE_SUBTITLE:
case AVMEDIA_TYPE_VIDEO:
avio_w8(pb, FLV_TAG_TYPE_VIDEO);
- flags = enc->codec_tag;
- if (flags <= 0 || flags > 15) {
- av_log(s, AV_LOG_ERROR,
- "Video codec '%s' is not compatible with FLV\n",
- avcodec_get_name(enc->codec_id));
- return AVERROR(EINVAL);
- }
+ flags = ff_codec_get_tag(flv_video_codec_ids, enc->codec_id);
flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER;
break;