b8a43bc1b5
* qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
64 lines
2.2 KiB
C
64 lines
2.2 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"
|
|
|
|
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. */
|
|
} FFRawVideoDemuxerContext;
|
|
|
|
extern const AVClass ff_rawaudio_demuxer_class;
|
|
extern const AVClass ff_rawvideo_demuxer_class;
|
|
|
|
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap);
|
|
|
|
int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt);
|
|
|
|
int ff_raw_audio_read_header(AVFormatContext *s, AVFormatParameters *ap);
|
|
|
|
int ff_raw_video_read_header(AVFormatContext *s, AVFormatParameters *ap);
|
|
|
|
#define FF_DEF_RAWVIDEO_DEMUXER(shortname, longname, probe, ext, id)\
|
|
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,\
|
|
.value = id,\
|
|
};
|
|
|
|
#endif /* AVFORMAT_RAWDEC_H */
|