x86: hpeldsp: avg_pixels_xy2 for mmx2&3dnow

[ffmpeg] / ffmpeg_opt.c

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 6f45785192bfe35132944af9b35de0f6a73dac43..eeacf5828cc21b6d1b4888be00cf1cf4d1f6ade4 100644 (file)
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1152,7 +1152,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
         input_streams[source_index]->st->discard = AVDISCARD_NONE;
     }
     ost->last_mux_dts = AV_NOPTS_VALUE;
-    ost->last_mux_dts_plus_duration = AV_NOPTS_VALUE;
 
     return ost;
 }
@@ -2067,6 +2066,8 @@ 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)
+                av_dict_set(&output_streams[i]->st->metadata, "encoder", NULL, 0);
         }
 
     /* process manually set metadata */