[FFmpeg-cvslog] ffmpeg: fix warning & bug for keep_pix_fmt
Michael Niedermayer
git at videolan.org
Sat May 19 00:24:19 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 19 00:15:03 2012 +0200| [48a40e09c4858c43627d9bc25efc3c47efdde5af] | committer: Michael Niedermayer
ffmpeg: fix warning & bug for keep_pix_fmt
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48a40e09c4858c43627d9bc25efc3c47efdde5af
---
ffmpeg.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index b9df89b..6501bd3 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -313,7 +313,6 @@ typedef struct OutputStream {
const char *attachment_filename;
int copy_initial_nonkeyframes;
- enum PixelFormat pix_fmts[2];
int keep_pix_fmt;
} OutputStream;
@@ -706,8 +705,7 @@ static char *choose_pix_fmts(OutputStream *ost)
AVFILTER_AUTO_CONVERT_NONE);
if (ost->st->codec->pix_fmt == PIX_FMT_NONE)
return NULL;
- ost->pix_fmts[0] = ost->st->codec->pix_fmt;
- return ost->pix_fmts;
+ return av_strdup(av_get_pix_fmt_name(ost->st->codec->pix_fmt));
}
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)));
@@ -4467,8 +4465,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
input_streams[source_index]->st->discard = AVDISCARD_NONE;
}
- ost->pix_fmts[0] = ost->pix_fmts[1] = PIX_FMT_NONE;
-
return ost;
}
More information about the ffmpeg-cvslog
mailing list