aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-10 11:45:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-10 11:45:45 +0200
commit0efbd98e233194659d6ff47e871924d0756539b5 (patch)
tree0fef16d3e187bee03dd4f71cc1d73cfcf2ea8a2b
parent70025c07a70334756b429f2892ee9ee9bbec119f (diff)
parent4d7aeff9a1080e64125f3374d993b2c9c4c2751b (diff)
downloadffmpeg-0efbd98e233194659d6ff47e871924d0756539b5.tar.gz
Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'
* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b': flvenc: Don't pretend to support muxing "plain" VP6 Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/flvenc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index b0f8a413a6..a1bda11ae7 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -37,7 +37,6 @@ 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 +459,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
uint8_t *data = NULL;
int flags = -1, flags_size, ret;
- if (enc->codec_id == AV_CODEC_ID_VP6 || 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 || enc->codec_id == AV_CODEC_ID_MPEG4)
@@ -561,8 +560,6 @@ 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)
avio_w8(pb, enc->extradata_size ? enc->extradata[0] : 0);
else if (enc->codec_id == AV_CODEC_ID_AAC)