Commit 48a40e09 authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg: fix warning & bug for keep_pix_fmt

Found-by: ubitux
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7f8bd161
...@@ -313,7 +313,6 @@ typedef struct OutputStream { ...@@ -313,7 +313,6 @@ typedef struct OutputStream {
const char *attachment_filename; const char *attachment_filename;
int copy_initial_nonkeyframes; int copy_initial_nonkeyframes;
enum PixelFormat pix_fmts[2];
int keep_pix_fmt; int keep_pix_fmt;
} OutputStream; } OutputStream;
...@@ -706,8 +705,7 @@ static char *choose_pix_fmts(OutputStream *ost) ...@@ -706,8 +705,7 @@ static char *choose_pix_fmts(OutputStream *ost)
AVFILTER_AUTO_CONVERT_NONE); AVFILTER_AUTO_CONVERT_NONE);
if (ost->st->codec->pix_fmt == PIX_FMT_NONE) if (ost->st->codec->pix_fmt == PIX_FMT_NONE)
return NULL; return NULL;
ost->pix_fmts[0] = ost->st->codec->pix_fmt; return av_strdup(av_get_pix_fmt_name(ost->st->codec->pix_fmt));
return ost->pix_fmts;
} }
if (ost->st->codec->pix_fmt != PIX_FMT_NONE) { if (ost->st->codec->pix_fmt != PIX_FMT_NONE) {
return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc, ost->st->codec->pix_fmt))); return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc, ost->st->codec->pix_fmt)));
...@@ -4467,8 +4465,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ...@@ -4467,8 +4465,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
input_streams[source_index]->st->discard = AVDISCARD_NONE; input_streams[source_index]->st->discard = AVDISCARD_NONE;
} }
ost->pix_fmts[0] = ost->pix_fmts[1] = PIX_FMT_NONE;
return ost; return ost;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment