]> git.sesse.net Git - ffmpeg/commitdiff
ffmpeg_opt: remove rotate metadata in case of autorotate
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 21:04:00 +0000 (23:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 21:04:00 +0000 (23:04 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt.c

index f59b93bba6831b7dd31a606d52ea323e3042968c..a8ee1c328e2ad049721f7da95c87a598091c11d9 100644 (file)
@@ -2184,8 +2184,11 @@ loop_end:
                 continue;
             ist = input_streams[output_streams[i]->source_index];
             av_dict_copy(&output_streams[i]->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE);
-            if (!output_streams[i]->stream_copy)
+            if (!output_streams[i]->stream_copy) {
                 av_dict_set(&output_streams[i]->st->metadata, "encoder", NULL, 0);
+                if (ist->autorotate)
+                    av_dict_set(&output_streams[i]->st->metadata, "rotate", NULL, 0);
+            }
         }
 
     /* process manually set metadata */