* qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * RAW video demuxer
 | 
						|
 * Copyright (c) 2001 Fabrice Bellard
 | 
						|
 *
 | 
						|
 * 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
 | 
						|
 */
 | 
						|
 | 
						|
#include "avformat.h"
 | 
						|
#include "rawdec.h"
 | 
						|
 | 
						|
static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
 | 
						|
{
 | 
						|
    int packet_size, ret, width, height;
 | 
						|
    AVStream *st = s->streams[0];
 | 
						|
 | 
						|
    width = st->codec->width;
 | 
						|
    height = st->codec->height;
 | 
						|
 | 
						|
    packet_size = avpicture_get_size(st->codec->pix_fmt, width, height);
 | 
						|
    if (packet_size < 0)
 | 
						|
        return -1;
 | 
						|
 | 
						|
    ret= av_get_packet(s->pb, pkt, packet_size);
 | 
						|
    pkt->pts=
 | 
						|
    pkt->dts= pkt->pos / packet_size;
 | 
						|
 | 
						|
    pkt->stream_index = 0;
 | 
						|
    if (ret < 0)
 | 
						|
        return ret;
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
 | 
						|
#define DEC AV_OPT_FLAG_DECODING_PARAM
 | 
						|
static const AVOption rawvideo_options[] = {
 | 
						|
    { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
 | 
						|
    { "pixel_format", "", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC },
 | 
						|
    { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC },
 | 
						|
    { NULL },
 | 
						|
};
 | 
						|
 | 
						|
static const AVClass rawvideo_demuxer_class = {
 | 
						|
    .class_name = "rawvideo demuxer",
 | 
						|
    .item_name  = av_default_item_name,
 | 
						|
    .option     = rawvideo_options,
 | 
						|
    .version    = LIBAVUTIL_VERSION_INT,
 | 
						|
};
 | 
						|
 | 
						|
AVInputFormat ff_rawvideo_demuxer = {
 | 
						|
    .name           = "rawvideo",
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL("raw video format"),
 | 
						|
    .priv_data_size = sizeof(FFRawVideoDemuxerContext),
 | 
						|
    .read_header    = ff_raw_read_header,
 | 
						|
    .read_packet    = rawvideo_read_packet,
 | 
						|
    .flags= AVFMT_GENERIC_INDEX,
 | 
						|
    .extensions = "yuv,cif,qcif,rgb",
 | 
						|
    .value = CODEC_ID_RAWVIDEO,
 | 
						|
    .priv_class = &rawvideo_demuxer_class,
 | 
						|
};
 |