mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
f9ecb849ef
* 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>
48 lines
1.5 KiB
C
48 lines
1.5 KiB
C
/*
|
|
* copyright (c) 2009 Michael Niedermayer
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVFORMAT_METADATA_H
|
|
#define AVFORMAT_METADATA_H
|
|
|
|
/**
|
|
* @file
|
|
* internal metadata API header
|
|
* see avformat.h or the public API!
|
|
*/
|
|
|
|
|
|
#include "avformat.h"
|
|
#include "libavutil/dict.h"
|
|
|
|
struct AVMetadataConv{
|
|
const char *native;
|
|
const char *generic;
|
|
};
|
|
#if !FF_API_OLD_METADATA2
|
|
typedef struct AVMetadataConv AVMetadataConv;
|
|
#endif
|
|
|
|
void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
|
|
const AVMetadataConv *s_conv);
|
|
void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
|
|
const AVMetadataConv *s_conv);
|
|
|
|
#endif /* AVFORMAT_METADATA_H */
|