mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-10 09:31:06 +02:00
39e4206dc6
* qatar/master: (32 commits)
doc: create separate section for audio encoders
swscale: Remove orphaned, commented-out function declaration.
swscale: Eliminate rgb24toyv12_c() duplication.
Remove h263_msmpeg4 from MpegEncContext.
APIchanges: Fill in git hash for fps_probe_size (30315a8)
avformat: Add fpsprobesize as an AVOption.
avoptions: Return explicitly NAN or {0,0} if the option isn't found
rtmp: Reindent
rtmp: Don't try to do av_malloc(0)
tty: replace AVFormatParameters.sample_rate abuse with a private option.
Fix end time of last chapter in compute_chapters_end
ffmpeg: get rid of useless AVInputStream.nb_streams.
ffmpeg: simplify managing input files and streams
ffmpeg: purge redundant AVInputStream.index.
lavf: deprecate AVFormatParameters.channel.
libdc1394: add a private option for channel.
dv1394: add a private option for channel.
v4l2: reindent.
v4l2: add a private option for channel.
lavf: deprecate AVFormatParameters.standard.
...
Conflicts:
doc/APIchanges
doc/encoders.texi
ffmpeg.c
libavdevice/alsa-audio.h
libavformat/version.h
libavutil/opt.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
45 lines
1.4 KiB
C
45 lines
1.4 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;
|
|
|
|
extern const AVClass ff_rawaudio_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);
|
|
|
|
#endif /* AVFORMAT_RAWDEC_H */
|