From 2ef6c1242aeebf863b86f34229490a023bfe65dc Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 25 Apr 2010 14:27:42 +0000 Subject: Mark av_metadata_set() as deprecated, and use av_metadata_set2() in its place. av_metadata_set() is going to be dropped at the next major bump. Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index a314126fb3..36eefe1c80 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3287,7 +3287,7 @@ static void new_video_stream(AVFormatContext *oc) } nb_ocodecs++; if (video_language) { - av_metadata_set(&st->metadata, "language", video_language); + av_metadata_set2(&st->metadata, "language", video_language, 0); av_freep(&video_language); } @@ -3361,7 +3361,7 @@ static void new_audio_stream(AVFormatContext *oc) nb_ocodecs++; audio_enc->time_base= (AVRational){1, audio_sample_rate}; if (audio_language) { - av_metadata_set(&st->metadata, "language", audio_language); + av_metadata_set2(&st->metadata, "language", audio_language, 0); av_freep(&audio_language); } @@ -3402,7 +3402,7 @@ static void new_subtitle_stream(AVFormatContext *oc) nb_ocodecs++; if (subtitle_language) { - av_metadata_set(&st->metadata, "language", subtitle_language); + av_metadata_set2(&st->metadata, "language", subtitle_language, 0); av_freep(&subtitle_language); } @@ -3533,8 +3533,8 @@ static void opt_output_file(const char *filename) oc->timestamp = rec_timestamp; for(; metadata_count>0; metadata_count--){ - av_metadata_set(&oc->metadata, metadata[metadata_count-1].key, - metadata[metadata_count-1].value); + 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); } -- cgit v1.2.3