[FFmpeg-cvslog] avfilter/vf_psnr: add gray10 and gray12 support

2016-12-21 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Wed Dec 21 21:37:22 
2016 +0100| [9933579a9be762c20a5a201b8685d09d40aa2cf5] | committer: Paul B Mahol

avfilter/vf_psnr: add gray10 and gray12 support

Signed-off-by: Paul B Mahol 

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

 libavfilter/vf_psnr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c
index 320f433..af93971 100644
--- a/libavfilter/vf_psnr.c
+++ b/libavfilter/vf_psnr.c
@@ -252,7 +252,7 @@ static av_cold int init(AVFilterContext *ctx)
 static int query_formats(AVFilterContext *ctx)
 {
 static const enum AVPixelFormat pix_fmts[] = {
-AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
+AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, 
AV_PIX_FMT_GRAY16,
 #define PF_NOALPHA(suf) AV_PIX_FMT_YUV420##suf,  AV_PIX_FMT_YUV422##suf,  
AV_PIX_FMT_YUV444##suf
 #define PF_ALPHA(suf)   AV_PIX_FMT_YUVA420##suf, AV_PIX_FMT_YUVA422##suf, 
AV_PIX_FMT_YUVA444##suf
 #define PF(suf) PF_NOALPHA(suf), PF_ALPHA(suf)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/img2dec: Remove dead code from psd_probe()

2016-12-21 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Dec 21 22:03:55 2016 +0100| [fd1fcb59dcdb0b1644097a69d0c64084bdc26052] | 
committer: Michael Niedermayer

avformat/img2dec: Remove dead code from psd_probe()

Fixes CID1397124

Signed-off-by: Michael Niedermayer 

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

 libavformat/img2dec.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index f1a0e7f..c8d7031 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -847,10 +847,7 @@ static int psd_probe(AVProbeData *p)
 if ((color_mode <= 9) && (color_mode != 5) && (color_mode != 6))
 ret += 1;
 
-if (ret)
-return AVPROBE_SCORE_EXTENSION + ret;
-
-return 0;
+return AVPROBE_SCORE_EXTENSION + ret;
 }
 
 static int sgi_probe(AVProbeData *p)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/mpegenc: Check for av_mallocz() failure

2016-12-21 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Dec 21 23:41:49 2016 +0100| [9b9e4a71c57261b6b690d9649b8e7a347df6a78b] | 
committer: Michael Niedermayer

avformat/mpegenc: Check for av_mallocz() failure

Fixes CID1257787

Signed-off-by: Michael Niedermayer 

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

 libavformat/mpegenc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 878fa63..c77c3df 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1146,6 +1146,8 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, 
AVPacket *pkt)
 stream->next_packet = &stream->premux_packet;
 *stream->next_packet =
 pkt_desc = av_mallocz(sizeof(PacketDesc));
+if (!pkt_desc)
+return AVERROR(ENOMEM);
 pkt_desc->pts= pts;
 pkt_desc->dts= dts;
 pkt_desc->unwritten_size =

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog