* qatar/master: (29 commits) fate: add golomb-test golomb-test: K&R formatting cosmetics h264: Split h264-test off into a separate file - golomb-test.c. h264-test: cleanup: drop timer invocations, commented out code and other cruft h264-test: Remove unused DSP and AVCodec contexts and related init calls. adpcm: Add missing stdint.h #include to fix standalone header compilation. lavf: add functions for accessing the fourcc<->CodecID mapping tables. lavc: set AVCodecContext.codec in avcodec_get_context_defaults3(). lavc: make avcodec_close() work properly on unopened codecs. lavc: add avcodec_is_open(). lavf: rename AVInputFormat.value to raw_codec_id. lavf: remove the pointless value field from flv and iv8 lavc/lavf: remove unnecessary symbols from the symbol version script. lavc: reorder AVCodec fields. lavf: reorder AVInput/OutputFormat fields. mp3dec: Fix a heap-buffer-overflow adpcmenc: remove some unneeded casts adpcmenc: use int16_t and uint8_t instead of short and unsigned char. adpcmenc: fix adpcm_ms extradata allocation adpcmenc: return proper AVERROR codes instead of -1 ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/adpcmenc.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/libavcodec.v libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/options.c libavformat/Makefile libavformat/avformat.h libavformat/flvdec.c libavformat/libavformat.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			76 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			76 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * RAW demuxers
 | 
						|
 * Copyright (C) 2007  Aurelien Jacobs <aurel@gnuage.org>
 | 
						|
 *
 | 
						|
 * 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_RAWDEC_H
 | 
						|
#define AVFORMAT_RAWDEC_H
 | 
						|
 | 
						|
#include "avformat.h"
 | 
						|
#include "libavutil/log.h"
 | 
						|
#include "libavutil/opt.h"
 | 
						|
 | 
						|
typedef struct RawAudioDemuxerContext {
 | 
						|
    AVClass *class;
 | 
						|
    int sample_rate;
 | 
						|
    int channels;
 | 
						|
} RawAudioDemuxerContext;
 | 
						|
 | 
						|
typedef struct FFRawVideoDemuxerContext {
 | 
						|
    const AVClass *class;     /**< Class for private options. */
 | 
						|
    char *video_size;         /**< String describing video size, set by a private option. */
 | 
						|
    char *pixel_format;       /**< Set by a private option. */
 | 
						|
    char *framerate;          /**< String describing framerate, set by a private option. */
 | 
						|
} FFRawVideoDemuxerContext;
 | 
						|
 | 
						|
extern const AVOption ff_rawvideo_options[];
 | 
						|
 | 
						|
int ff_raw_read_header(AVFormatContext *s);
 | 
						|
 | 
						|
int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt);
 | 
						|
 | 
						|
int ff_raw_audio_read_header(AVFormatContext *s);
 | 
						|
 | 
						|
int ff_raw_video_read_header(AVFormatContext *s);
 | 
						|
 | 
						|
#define FF_RAWVIDEO_DEMUXER_CLASS(name)\
 | 
						|
static const AVClass name ## _demuxer_class = {\
 | 
						|
    .class_name = #name " demuxer",\
 | 
						|
    .item_name  = av_default_item_name,\
 | 
						|
    .option     = ff_rawvideo_options,\
 | 
						|
    .version    = LIBAVUTIL_VERSION_INT,\
 | 
						|
};
 | 
						|
 | 
						|
#define FF_DEF_RAWVIDEO_DEMUXER(shortname, longname, probe, ext, id)\
 | 
						|
FF_RAWVIDEO_DEMUXER_CLASS(shortname)\
 | 
						|
AVInputFormat ff_ ## shortname ## _demuxer = {\
 | 
						|
    .name           = #shortname,\
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL(longname),\
 | 
						|
    .read_probe     = probe,\
 | 
						|
    .read_header    = ff_raw_video_read_header,\
 | 
						|
    .read_packet    = ff_raw_read_partial_packet,\
 | 
						|
    .extensions     = ext,\
 | 
						|
    .flags          = AVFMT_GENERIC_INDEX,\
 | 
						|
    .raw_codec_id   = id,\
 | 
						|
    .priv_data_size = sizeof(FFRawVideoDemuxerContext),\
 | 
						|
    .priv_class     = &shortname ## _demuxer_class,\
 | 
						|
};
 | 
						|
 | 
						|
#endif /* AVFORMAT_RAWDEC_H */
 |