diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 16:16:12 +0400 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-27 23:24:31 +0400 |
commit | 1fa7ad2e20dbaf4dffcc9441cb9558a3bf7ceea4 (patch) | |
tree | d6af8a886a8f8060516d73cac44be29a4627557e | |
parent | f51483491749895c6d097cd02475ee2162502051 (diff) |
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@gmx.at>
(cherry picked from commit d9bc251d3978cf0b9722991f7c23edebca7abb18)
-rw-r--r-- | ffmpeg_filter.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 1fe2106a7c..7d264c0e92 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, |