[FFmpeg-cvslog] ffmpeg: fix regression with png

Michael Niedermayer git at videolan.org
Tue Apr 17 04:51:57 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 17 03:15:54 2012 +0200| [89f86379797830870c5d499c0add1e1c9de9b70a] | committer: Michael Niedermayer

ffmpeg: fix regression with png

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89f86379797830870c5d499c0add1e1c9de9b70a
---

 ffmpeg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index d1d1e73..3e20d44 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -702,7 +702,7 @@ static enum PixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum Pixe
 static const enum PixelFormat *choose_pixel_fmts(OutputStream *ost)
 {
     if (ost->st->codec->pix_fmt != PIX_FMT_NONE) {
-        ost->pix_fmts[0] = ost->st->codec->pix_fmt;
+        ost->pix_fmts[0] = choose_pixel_fmt(ost->st, ost->enc, ost->st->codec->pix_fmt);
         return ost->pix_fmts;
     } else if (ost->enc->pix_fmts)
         return ost->enc->pix_fmts;



More information about the ffmpeg-cvslog mailing list