diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-31 01:24:07 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-12-09 13:18:29 +0100 |
| commit | b8667bccad2eec64e5dbf24fab16767f0f7ea234 (patch) | |
| tree | b0bc50f5bbbf3d67ba8f5b5982fc9ee01ad53650 | |
| parent | 8947f47fdfaf7f3a907a334fc65dc724f2fdd23f (diff) | |
| download | ffmpeg-b8667bccad2eec64e5dbf24fab16767f0f7ea234.tar.gz | |
Revert: flvenc: Don't pretend to support muxing "plain" VP6
Muxing VP6 is used by applications and works with Flashplayer.
Reported-by: David Bertrand
| -rw-r--r-- | libavformat/flvenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 922410386e..a1b498d9e1 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -37,6 +37,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_VP6, FLV_CODECID_VP6 }, { AV_CODEC_ID_VP6A, FLV_CODECID_VP6A }, { AV_CODEC_ID_H264, FLV_CODECID_H264 }, { AV_CODEC_ID_NONE, 0 } @@ -460,7 +461,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) int flags = -1, flags_size, ret; if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A || - enc->codec_id == AV_CODEC_ID_AAC) + enc->codec_id == AV_CODEC_ID_VP6 || enc->codec_id == AV_CODEC_ID_AAC) flags_size = 2; else if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4) flags_size = 5; @@ -560,6 +561,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } else { av_assert1(flags>=0); avio_w8(pb,flags); + if (enc->codec_id == AV_CODEC_ID_VP6) + avio_w8(pb,0); if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A) { if (enc->extradata_size) avio_w8(pb, enc->extradata[0]); |