diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 12:06:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 12:06:17 +0200 |
| commit | 7acb464f0e8c277a19a19f87f2cc7a71fc6e0bc8 (patch) | |
| tree | 5e373d4d2393bee85f19c1c2d0c238c5bc7d49ee /libavformat/flvenc.c | |
| parent | c2555bcbd147d068c47363ba294e9c21cfceb6c7 (diff) | |
| parent | e6ed8668597cfea25dfb350a9b4df7fb2efc1d90 (diff) | |
| download | ffmpeg-7acb464f0e8c277a19a19f87f2cc7a71fc6e0bc8.tar.gz | |
Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'
* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90':
flvenc: Write proper cropping for VP6 even if there's no extradata
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
| -rw-r--r-- | libavformat/flvenc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 1c2077b0b5..922410386e 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -560,13 +560,17 @@ 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_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 + 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 || enc->codec_id == AV_CODEC_ID_MPEG4) { - avio_w8(pb,1); // AVC NALU - avio_wb24(pb,pkt->pts - pkt->dts); + avio_w8(pb, 1); // AVC NALU + avio_wb24(pb, pkt->pts - pkt->dts); } avio_write(pb, data ? data : pkt->data, size); |