diff options
| author | Mats Peterson <matsp888@yahoo.com> | 2016-03-08 11:26:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-08 15:33:17 +0100 |
| commit | e1aa88dc09a7a0347b0a35a1a7b526e743a9f253 (patch) | |
| tree | 53043db96d7caab5183127f96d2bab8cc433462d /libavformat | |
| parent | fd0c9789cfe88d9b07d390339f193072d8d662af (diff) | |
| download | ffmpeg-e1aa88dc09a7a0347b0a35a1a7b526e743a9f253.tar.gz | |
lavf/avienc: Palette changing code only concerns AV_PIX_FMT_PAL8
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avienc.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 357dd34967..ad503793f7 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -656,13 +656,8 @@ static int write_skip_frames(AVFormatContext *s, int stream_index, int64_t dts) static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) { - unsigned char tag[5]; const int stream_index = pkt->stream_index; - AVIOContext *pb = s->pb; AVCodecContext *enc = s->streams[stream_index]->codec; - AVIStream *avist = s->streams[stream_index]->priv_data; - AVPacket *opkt = pkt; - enum AVPixelFormat pix_fmt = enc->pix_fmt; int ret; if (enc->codec_id == AV_CODEC_ID_H264 && enc->codec_tag == MKTAG('H','2','6','4') && pkt->size) { @@ -678,6 +673,9 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) return avi_write_packet_internal(s, pkt); /* Passthrough */ if (enc->codec_type == AVMEDIA_TYPE_VIDEO) { + AVIStream *avist = s->streams[stream_index]->priv_data; + AVIOContext *pb = s->pb; + AVPacket *opkt = pkt; if (enc->codec_id == AV_CODEC_ID_RAWVIDEO && enc->codec_tag == 0) { int64_t bpc = enc->bits_per_coded_sample != 15 ? enc->bits_per_coded_sample : 16; int expected_stride = ((enc->width * bpc + 31) >> 5)*4; @@ -686,11 +684,7 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) return ret; } else ret = 0; - if (pix_fmt == AV_PIX_FMT_NONE && enc->bits_per_coded_sample == 1) - pix_fmt = AV_PIX_FMT_MONOWHITE; - if (pix_fmt == AV_PIX_FMT_PAL8 || - pix_fmt == AV_PIX_FMT_MONOWHITE || - pix_fmt == AV_PIX_FMT_MONOBLACK) { + if (enc->pix_fmt == AV_PIX_FMT_PAL8) { int ret2 = ff_get_packet_palette(s, opkt, ret, avist->palette); if (ret2 < 0) return ret2; @@ -712,6 +706,7 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) avist->pal_offset = 0; } if (memcmp(avist->palette, avist->old_palette, pal_size * 4)) { + unsigned char tag[5]; avi_stream2fourcc(tag, stream_index, enc->codec_type); tag[2] = 'p'; tag[3] = 'c'; pc_tag = ff_start_tag(pb, tag); |