summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-10-02 12:16:12 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-10-27 16:41:06 (GMT)
commitd9bc251d3978cf0b9722991f7c23edebca7abb18 (patch)
tree1727c215b9692157b2b8afe0efcfe494fa4bcd25
parent4307026243c06715c7d4fa5f56ba4b2eb7f84eac (diff)
downloadffmpeg-d9bc251d3978cf0b9722991f7c23edebca7abb18.zip
ffmpeg-d9bc251d3978cf0b9722991f7c23edebca7abb18.tar.gz
ffmpeg-d9bc251d3978cf0b9722991f7c23edebca7abb18.tar.bz2
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>
Diffstat
-rw-r--r--ffmpeg_filter.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 76d3be6..461cc90 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,