diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-25 14:27:42 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-25 14:27:42 +0000 |
| commit | 2ef6c1242aeebf863b86f34229490a023bfe65dc (patch) | |
| tree | c6ab0ec0003050c62ce4d19b36935c9dd4cb7a64 /ffserver.c | |
| parent | 472e12f510dc5cc457edd2b1543bacfe9f952f2a (diff) | |
| download | ffmpeg-2ef6c1242aeebf863b86f34229490a023bfe65dc.tar.gz | |
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
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ffserver.c b/ffserver.c index 8bc6c0f334..e81245d9d3 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2232,10 +2232,10 @@ static int http_prepare_data(HTTPContext *c) switch(c->state) { case HTTPSTATE_SEND_DATA_HEADER: memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx)); - av_metadata_set(&c->fmt_ctx.metadata, "author" ,c->stream->author); - av_metadata_set(&c->fmt_ctx.metadata, "comment" ,c->stream->comment); - av_metadata_set(&c->fmt_ctx.metadata, "copyright",c->stream->copyright); - av_metadata_set(&c->fmt_ctx.metadata, "title" ,c->stream->title); + av_metadata_set2(&c->fmt_ctx.metadata, "author" , c->stream->author , 0); + av_metadata_set2(&c->fmt_ctx.metadata, "comment" , c->stream->comment , 0); + av_metadata_set2(&c->fmt_ctx.metadata, "copyright", c->stream->copyright, 0); + av_metadata_set2(&c->fmt_ctx.metadata, "title" , c->stream->title , 0); for(i=0;i<c->stream->nb_streams;i++) { AVStream *st; @@ -2939,8 +2939,8 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, if (avc == NULL) { return -1; } - av_metadata_set(&avc->metadata, "title", - stream->title[0] ? stream->title : "No Title"); + av_metadata_set2(&avc->metadata, "title", + stream->title[0] ? stream->title : "No Title", 0); avc->nb_streams = stream->nb_streams; if (stream->is_multicast) { snprintf(avc->filename, 1024, "rtp://%s:%d?multicast=1?ttl=%d", |