diff options
author | Anton Khirnov <wyskas@gmail.com> | 2010-10-16 17:04:27 +0400 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-16 17:04:27 +0400 |
commit | a7e5a832c4839f83ea270886f7400efb56307f6e (patch) | |
tree | 78de3b881b52fadbc51364042b233fd1aec91e08 /ffmpeg.c | |
parent | 2a24df9357f89a9fa9d5aaeb4d2a503fa545de27 (diff) |
ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv()
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25503 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -2398,8 +2398,6 @@ static int transcode(AVFormatContext **output_files, mtag=NULL; while((mtag=av_metadata_get(in_file->metadata, "", mtag, AV_METADATA_IGNORE_SUFFIX))) av_metadata_set2(&out_file->metadata, mtag->key, mtag->value, AV_METADATA_DONT_OVERWRITE); - av_metadata_conv(out_file, out_file->oformat->metadata_conv, - in_file->iformat->metadata_conv); } /* copy chapters from the first input file that has them*/ @@ -3763,7 +3761,6 @@ static void opt_output_file(const char *filename) av_metadata_set2(&oc->metadata, metadata[metadata_count-1].key, metadata[metadata_count-1].value, 0); } - av_metadata_conv(oc, oc->oformat->metadata_conv, NULL); } output_files[nb_output_files++] = oc; |