• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e37f161e
    Michael Niedermayer authored
    * qatar/master: (71 commits)
      movenc: Allow writing to a non-seekable output if using empty moov
      movenc: Support adding isml (smooth streaming live) metadata
      libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
      sunrast: Document the different Sun Raster file format types.
      sunrast: Add a check for experimental type.
      libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
      lavf: remove disabled FF_API_SET_PTS_INFO cruft
      lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
      lavf: remove disabled FF_API_REORDER_PRIVATE cruft
      lavf: remove disabled FF_API_SEEK_PUBLIC cruft
      lavf: remove disabled FF_API_STREAM_COPY cruft
      lavf: remove disabled FF_API_PRELOAD cruft
      lavf: remove disabled FF_API_NEW_STREAM cruft
      lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
      lavf: remove disabled FF_API_MUXRATE cruft
      lavf: remove disabled FF_API_FILESIZE cruft
      lavf: remove disabled FF_API_TIMESTAMP cruft
      lavf: remove disabled FF_API_LOOP_OUTPUT cruft
      lavf: remove disabled FF_API_LOOP_INPUT cruft
      lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/8bps.c
    	libavcodec/avcodec.h
    	libavcodec/libx264.c
    	libavcodec/mjpegbdec.c
    	libavcodec/options.c
    	libavcodec/sunrast.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavcodec/x86/h264_deblock.asm
    	libavdevice/libdc1394.c
    	libavdevice/v4l2.c
    	libavformat/avformat.h
    	libavformat/avio.c
    	libavformat/avio.h
    	libavformat/aviobuf.c
    	libavformat/dv.c
    	libavformat/mov.c
    	libavformat/utils.c
    	libavformat/version.h
    	libavformat/wtv.c
    	libavutil/Makefile
    	libavutil/file.c
    	libswscale/x86/input.asm
    	libswscale/x86/swscale_mmx.c
    	libswscale/x86/swscale_template.c
    	tests/ref/lavf/ffm
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e37f161e
metadata.h 1.4 KB
/*
 * 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"

typedef struct AVMetadataConv {
    const char *native;
    const char *generic;
} AVMetadataConv;

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 */