diff options
| author | Martin Storsjö <martin@martin.st> | 2013-08-15 11:04:07 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-10-10 10:42:10 +0300 |
| commit | be1e1373d267bae2af8a62d79eef736736f24565 (patch) | |
| tree | 1f345a414c01e11c0308fb32ce66d07c8ecd7e1b /libavformat | |
| parent | 4d7aeff9a1080e64125f3374d993b2c9c4c2751b (diff) | |
| download | ffmpeg-be1e1373d267bae2af8a62d79eef736736f24565.tar.gz | |
flvenc: Support muxing VP6A as well
Handle it in the same way as VP6F, except for the codec tag.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 57fab6cbd6..086c5a3070 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -35,6 +35,7 @@ static const AVCodecTag flv_video_codec_ids[] = { { AV_CODEC_ID_FLASHSV, FLV_CODECID_SCREEN }, { AV_CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2 }, { AV_CODEC_ID_VP6F, FLV_CODECID_VP6 }, + { AV_CODEC_ID_VP6A, FLV_CODECID_VP6A }, { AV_CODEC_ID_H264, FLV_CODECID_H264 }, { AV_CODEC_ID_NONE, 0 } }; @@ -436,7 +437,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *data = NULL; int flags = 0, flags_size; - if (enc->codec_id == AV_CODEC_ID_VP6F || + if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A || enc->codec_id == AV_CODEC_ID_AAC) flags_size = 2; else if (enc->codec_id == AV_CODEC_ID_H264) @@ -526,7 +527,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wb32(pb, data_size + 11); } else { avio_w8(pb,flags); - if (enc->codec_id == AV_CODEC_ID_VP6F) + if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A) avio_w8(pb, enc->extradata_size ? enc->extradata[0] : 0); else if (enc->codec_id == AV_CODEC_ID_AAC) avio_w8(pb, 1); // AAC raw |