diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-18 00:28:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-18 00:52:36 +0200 |
| commit | 57e38043def65418333885c7481b197d470af336 (patch) | |
| tree | ad7db8e3a215ef014a7ac07fbe857c8edb7624e3 /ffmpeg_opt.c | |
| parent | 14c4b2515836811d53bb5696951637537353387f (diff) | |
| download | ffmpeg-streaming-57e38043def65418333885c7481b197d470af336.zip ffmpeg-streaming-57e38043def65418333885c7481b197d470af336.tar.gz | |
ffmpeg: Do not copy the display matrix if rotation meta-data is manually added
Fixes Ticket4560
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 240f727..5731299 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2209,8 +2209,12 @@ loop_end: parse_meta_type(o->metadata[i].specifier, &type, &index, &stream_spec); if (type == 's') { for (j = 0; j < oc->nb_streams; j++) { + ost = output_streams[nb_output_streams - oc->nb_streams + j]; if ((ret = check_stream_specifier(oc, oc->streams[j], stream_spec)) > 0) { av_dict_set(&oc->streams[j]->metadata, o->metadata[i].u.str, *val ? val : NULL, 0); + if (!strcmp(o->metadata[i].u.str, "rotate")) { + ost->rotate_overridden = 1; + } } else if (ret < 0) exit_program(1); } |
