diff options
| author | Martin Storsjö <martin@martin.st> | 2013-08-15 11:07:30 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-10-10 10:42:28 +0300 |
| commit | e6ed8668597cfea25dfb350a9b4df7fb2efc1d90 (patch) | |
| tree | 836bde6f4cec9c7defa3c92f2d4e03a1aa8ac1aa /libavformat/flvenc.c | |
| parent | be1e1373d267bae2af8a62d79eef736736f24565 (diff) | |
| download | ffmpeg-e6ed8668597cfea25dfb350a9b4df7fb2efc1d90.tar.gz | |
flvenc: Write proper cropping for VP6 even if there's no extradata
This keeps cropping when remuxing from F4V to FLV.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/flvenc.c')
| -rw-r--r-- | libavformat/flvenc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 086c5a3070..ca453f6025 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -527,9 +527,13 @@ 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 || 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) + 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]); + else + avio_w8(pb, ((FFALIGN(enc->width, 16) - enc->width) << 4) | + (FFALIGN(enc->height, 16) - enc->height)); + } else if (enc->codec_id == AV_CODEC_ID_AAC) avio_w8(pb, 1); // AAC raw else if (enc->codec_id == AV_CODEC_ID_H264) { avio_w8(pb, 1); // AVC NALU |