[FFmpeg-cvslog] ffmpeg_filter: Fix non jpeg yuv in jpeg support

Michael Niedermayer git at videolan.org
Sun Oct 27 20:54:04 CET 2013


ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  2 14:16:12 2013 +0200| [1fa7ad2e20dbaf4dffcc9441cb9558a3bf7ceea4] | committer: Carl Eugen Hoyos

ffmpeg_filter: Fix non jpeg yuv in jpeg support

This is a regression, did not bisect so dont know what caused it but
likely some changes to the command line handling code.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d9bc251d3978cf0b9722991f7c23edebca7abb18)

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

 ffmpeg_filter.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 1fe2106..7d264c0 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -92,6 +92,11 @@ void choose_sample_fmt(AVStream *st, AVCodec *codec)
 
 static char *choose_pix_fmts(OutputStream *ost)
 {
+    AVDictionaryEntry *strict_dict = av_dict_get(ost->opts, "strict", NULL, 0);
+    if (strict_dict)
+        // used by choose_pixel_fmt() and below
+        av_opt_set(ost->st->codec, "strict", strict_dict->value, 0);
+
      if (ost->keep_pix_fmt) {
         if (ost->filter)
             avfilter_graph_set_auto_convert(ost->filter->graph->graph,



More information about the ffmpeg-cvslog mailing list