annotate metadata.h @ 5854:3dc78fb78b2a libavformat

Fix erroneous behaviour when format probe hits end of file If the format probe hits end of file, do not add the error code to the buffer position. This is obviously wrong, and with a small input file would cause a negative buffer overflow. Fixes issue 1818.
author mru
date Tue, 16 Mar 2010 21:45:30 +0000
parents 6d530eb42996
children 178de7695c6c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4150
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
1 /*
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
2 * copyright (c) 2009 Michael Niedermayer
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
3 *
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
4 * This file is part of FFmpeg.
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
5 *
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
10 *
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
14 * Lesser General Public License for more details.
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
15 *
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
19 */
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
20
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
21 #ifndef AVFORMAT_METADATA_H
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
22 #define AVFORMAT_METADATA_H
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
23
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
24 /**
4331
49c1d3b27727 Use full internal pathname in doxygen @file directives.
diego
parents: 4181
diff changeset
25 * @file libavformat/metadata.h
4150
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
26 * internal metadata API header
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
27 * see avformat.h or the public API!
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
28 */
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
29
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
30
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
31 #include "avformat.h"
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
32
4154
bd4d3fee45d0 rename AVMetaData to AVMetadata and meta_data to metadata
aurel
parents: 4150
diff changeset
33 struct AVMetadata{
4150
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
34 int count;
4154
bd4d3fee45d0 rename AVMetaData to AVMetadata and meta_data to metadata
aurel
parents: 4150
diff changeset
35 AVMetadataTag *elems;
4150
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
36 };
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
37
4617
f04bc8b70940 add a metadata conversion API
aurel
parents: 4331
diff changeset
38 struct AVMetadataConv{
f04bc8b70940 add a metadata conversion API
aurel
parents: 4331
diff changeset
39 const char *native;
f04bc8b70940 add a metadata conversion API
aurel
parents: 4331
diff changeset
40 const char *generic;
f04bc8b70940 add a metadata conversion API
aurel
parents: 4331
diff changeset
41 };
f04bc8b70940 add a metadata conversion API
aurel
parents: 4331
diff changeset
42
4158
ea1e24175669 Add a metadata compatibility layer, so that when a user application set
aurel
parents: 4154
diff changeset
43 #if LIBAVFORMAT_VERSION_MAJOR < 53
4179
c32a783ff374 Add a second metadata compatibility layer, so that metadata that gets
aurel
parents: 4158
diff changeset
44 void ff_metadata_demux_compat(AVFormatContext *s);
4181
17a8a3696ee1 rename ff_metadata_sync_compat to ff_metadata_mux_compat
aurel
parents: 4179
diff changeset
45 void ff_metadata_mux_compat(AVFormatContext *s);
4158
ea1e24175669 Add a metadata compatibility layer, so that when a user application set
aurel
parents: 4154
diff changeset
46 #endif
ea1e24175669 Add a metadata compatibility layer, so that when a user application set
aurel
parents: 4154
diff changeset
47
5661
6d530eb42996 Set lavf identification string globally in av_write_header(), rather
rbultje
parents: 4617
diff changeset
48 void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
6d530eb42996 Set lavf identification string globally in av_write_header(), rather
rbultje
parents: 4617
diff changeset
49 const AVMetadataConv *s_conv);
6d530eb42996 Set lavf identification string globally in av_write_header(), rather
rbultje
parents: 4617
diff changeset
50
4150
6f4c0d5f1e23 Move metadata API from avcodec to avformat.
michael
parents:
diff changeset
51 #endif /* AVFORMAT_METADATA_H */