[FFmpeg-cvslog] ffmpeg_opt: remove rotate metadata in case of autorotate

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  2 23:04:00 2015 +0200| [a1acae0409700e1abe62cbc900321fcffc9d971d] | committer: Michael Niedermayer

ffmpeg_opt: remove rotate metadata in case of autorotate

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg_opt.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index f59b93b..a8ee1c3 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -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 */