projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a28fa0
)
ffmpeg: fix regression with png
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 17 Apr 2012 01:15:54 +0000
(
03:15
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 17 Apr 2012 02:04:56 +0000
(
04:04
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
d1d1e73
..
3e20d44
100644
(file)
--- 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;