| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * copyright (c) 2009 Michael Niedermayer | 2  * copyright (c) 2009 Michael Niedermayer | 
| 3  * | 3  * | 
| 4  * This file is part of FFmpeg. | 4  * This file is part of FFmpeg. | 
| 5  * | 5  * | 
| 6  * FFmpeg is free software; you can redistribute it and/or | 6  * FFmpeg is free software; you can redistribute it and/or | 
| 7  * modify it under the terms of the GNU Lesser General Public | 7  * modify it under the terms of the GNU Lesser General Public | 
| 8  * License as published by the Free Software Foundation; either | 8  * License as published by the Free Software Foundation; either | 
| 9  * version 2.1 of the License, or (at your option) any later version. | 9  * version 2.1 of the License, or (at your option) any later version. | 
| 10  * | 10  * | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 32 | 32 | 
| 33 struct AVMetadata{ | 33 struct AVMetadata{ | 
| 34     int count; | 34     int count; | 
| 35     AVMetadataTag *elems; | 35     AVMetadataTag *elems; | 
| 36 }; | 36 }; | 
| 37 | 37 | 
| 38 struct AVMetadataConv{ | 38 struct AVMetadataConv{ | 
| 39     const char *native; | 39     const char *native; | 
| 40     const char *generic; | 40     const char *generic; | 
| 41 }; | 41 }; | 
|  | 42 #if !FF_API_OLD_METADATA | 
|  | 43 typedef struct AVMetadataConv AVMetadataConv; | 
|  | 44 #endif | 
| 42 | 45 | 
| 43 #if FF_API_OLD_METADATA | 46 #if FF_API_OLD_METADATA | 
| 44 void ff_metadata_demux_compat(AVFormatContext *s); | 47 void ff_metadata_demux_compat(AVFormatContext *s); | 
| 45 void ff_metadata_mux_compat(AVFormatContext *s); | 48 void ff_metadata_mux_compat(AVFormatContext *s); | 
| 46 #endif | 49 #endif | 
| 47 | 50 | 
| 48 void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv, | 51 void ff_metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv, | 
| 49                                     const AVMetadataConv *s_conv); | 52                                        const AVMetadataConv *s_conv); | 
|  | 53 void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv, | 
|  | 54                                                 const AVMetadataConv *s_conv); | 
| 50 | 55 | 
| 51 #endif /* AVFORMAT_METADATA_H */ | 56 #endif /* AVFORMAT_METADATA_H */ | 
| OLD | NEW | 
|---|