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/mpc.c | |
| parent | 7b8ed831eb8432d202dad16dedc1758b018bb1fa (diff) | |
| parent | a71bcd1a7f66e210971c44452dc4cdae7bdbd98a (diff) | |
| download | ffmpeg-streaming-f9ecb849ef39bc337d9439b829fe08da5c95cc3d.zip ffmpeg-streaming-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/mpc.c')
| -rw-r--r-- | libavformat/mpc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpc.c b/libavformat/mpc.c index 3544cf1..4d6854f 100644 --- a/libavformat/mpc.c +++ b/libavformat/mpc.c @@ -23,6 +23,7 @@ #include "avformat.h" #include "apetag.h" #include "id3v1.h" +#include "libavutil/dict.h" #define MPC_FRAMESIZE 1152 #define DELAY_FRAMES 32 @@ -96,7 +97,7 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap) if (s->pb->seekable) { int64_t pos = avio_tell(s->pb); ff_ape_parse_tag(s); - if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) + if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) ff_id3v1_read(s); avio_seek(s->pb, pos, SEEK_SET); } |
