mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-09 14:14:39 +02:00
avcodec/get_buffer: Don't get AVPixFmtDescriptor unnecessarily
It is unused since 3575a495f6dcc395656343380e13c57d48b9f976 (and the error message is dangerous: av_get_pix_fmt_name(format) returns NULL iff av_pix_fmt_desc_get(format) returns NULL and using a NULL string for %s would be UB). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
e506843183
commit
f76cef5c51
@ -246,7 +246,6 @@ fail:
|
|||||||
static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
|
static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
|
||||||
{
|
{
|
||||||
FramePool *pool = (FramePool*)s->internal->pool->data;
|
FramePool *pool = (FramePool*)s->internal->pool->data;
|
||||||
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pic->format);
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (pic->data[0] || pic->data[1] || pic->data[2] || pic->data[3]) {
|
if (pic->data[0] || pic->data[1] || pic->data[2] || pic->data[3]) {
|
||||||
@ -254,13 +253,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!desc) {
|
|
||||||
av_log(s, AV_LOG_ERROR,
|
|
||||||
"Unable to get pixel format descriptor for format %s\n",
|
|
||||||
av_get_pix_fmt_name(pic->format));
|
|
||||||
return AVERROR(EINVAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(pic->data, 0, sizeof(pic->data));
|
memset(pic->data, 0, sizeof(pic->data));
|
||||||
pic->extended_data = pic->data;
|
pic->extended_data = pic->data;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user