diff mbox series

[FFmpeg-devel] libavformat/avienc: Check bits per sample for PAL8

Message ID 20200126220653.811-1-michael@niedermayer.cc
State Accepted
Headers show
Series [FFmpeg-devel] libavformat/avienc: Check bits per sample for PAL8 | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Michael Niedermayer Jan. 26, 2020, 10:06 p.m. UTC 
Fixes: assertion failure
Fixes: Ticket 8172

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/avienc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Michael Niedermayer Feb. 27, 2020, 9:34 p.m. UTC | #1 
On Sun, Jan 26, 2020 at 11:06:53PM +0100, Michael Niedermayer wrote:
> Fixes: assertion failure
> Fixes: Ticket 8172
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/avienc.c | 8 ++++++++
>  1 file changed, 8 insertions(+)

will apply


[...]
diff mbox series

Patch

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index d6cfb1b783..07e1c3319e 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -458,6 +458,14 @@  static int avi_write_header(AVFormatContext *s)
                     && par->format != AV_PIX_FMT_NONE)
                     av_log(s, AV_LOG_ERROR, "%s rawvideo cannot be written to avi, output file will be unreadable\n",
                           av_get_pix_fmt_name(par->format));
+
+                if (par->format == AV_PIX_FMT_PAL8) {
+                    if (par->bits_per_coded_sample < 0 || par->bits_per_coded_sample > 8) {
+                        av_log(s, AV_LOG_ERROR, "PAL8 with %d bps is not allowed\n", par->bits_per_coded_sample);
+                        return AVERROR(EINVAL);
+                    }
+                }
+
                 break;
             case AVMEDIA_TYPE_AUDIO:
                 flags = (avi->write_channel_mask == 0) ? FF_PUT_WAV_HEADER_SKIP_CHANNELMASK : 0;