diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-09 04:47:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-09 04:47:19 +0200 |
| commit | f9ecb849ef39bc337d9439b829fe08da5c95cc3d (patch) | |
| tree | 761e860a10084d8de4f07815911f697fe11610b9 /libavformat/sdp.c | |
| parent | 7b8ed831eb8432d202dad16dedc1758b018bb1fa (diff) | |
| parent | a71bcd1a7f66e210971c44452dc4cdae7bdbd98a (diff) | |
| download | ffmpeg-f9ecb849ef39bc337d9439b829fe08da5c95cc3d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
crypto: Use av_freep instead of av_free
lavf: don't try to free private options if priv_data is NULL.
swscale: fix types of assembly arguments.
swscale: move two macros that are only used once into caller.
swscale: remove unused function.
options: Add missing braces around struct initializer.
mov: Remove leftover crufty debug statement with references to a local file.
dvbsubdec: Fix compilation of debug code.
Remove all uses of now deprecated metadata functions.
Move metadata API from lavf to lavu.
Conflicts:
doc/APIchanges
libavformat/aiffdec.c
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/cafdec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/wtv.c
libavutil/avutil.h
libavutil/internal.h
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sdp.c')
| -rw-r--r-- | libavformat/sdp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 409948ebbb..3abc5ef567 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -21,6 +21,7 @@ #include <string.h> #include "libavutil/avstring.h" #include "libavutil/base64.h" +#include "libavutil/dict.h" #include "libavutil/parseutils.h" #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" @@ -550,7 +551,7 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size) { - AVMetadataTag *title = av_metadata_get(ac[0]->metadata, "title", NULL, 0); + AVDictionaryEntry *title = av_dict_get(ac[0]->metadata, "title", NULL, 0); struct sdp_session_level s; int i, j, port, ttl, is_multicast; char dst[32], dst_type[5]; |