diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:41:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:41:44 +0200 |
| commit | f5b2718c0ae53459fbd506419884068687278583 (patch) | |
| tree | 3160e84f7966427d5b6e678d9dbb8f05c0a127a0 | |
| parent | 7d03e60c124be3e316636b0086910f1bcc1a797d (diff) | |
| parent | 971cce7ebb48a58e72e4dc57b3008e2682bcf4e7 (diff) | |
| download | ffmpeg-f5b2718c0ae53459fbd506419884068687278583.tar.gz | |
Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'
* commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7':
riff.h: Remove stray extern declaration for non-existing symbol
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/riff.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/riff.h b/libavformat/riff.h index cb8378922f..1bf437e06c 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -34,7 +34,6 @@ #include "metadata.h" extern const AVMetadataConv ff_riff_info_conv[]; -extern const char ff_riff_tags[][5]; int64_t ff_start_tag(AVIOContext *pb, const char *tag); void ff_end_tag(AVIOContext *pb, int64_t start); |