mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
29582df797
* qatar/master: vble: remove vble_error_close VBLE Decoder tta: use an integer instead of a pointer to iterate output samples shorten: do not modify samples pointer when interleaving mpc7: only support stereo input. dpcm: do not try to decode empty packets dpcm: remove unneeded buf_size==0 check. twinvq: add SSE/AVX optimized sum/difference stereo interleaving vqf/twinvq: pass vqf COMM chunk info in extradata vqf: do not set bits_per_coded_sample for TwinVQ. twinvq: check for allocation failure in init_mdct_win() swscale: add padding to conversion buffer. rtpdec: Simplify finalize_packet http: Handle proxy authentication http: Print an error message for Authorization Required, too AVOptions: don't return an invalid option when option list is empty AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio) Conflicts: libavcodec/avcodec.h libavcodec/tta.c libavcodec/vble.c libavcodec/version.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
55 lines
2.0 KiB
C
55 lines
2.0 KiB
C
/*
|
|
* AIFF/AIFF-C muxer/demuxer common header
|
|
* Copyright (c) 2006 Patrick Guimond
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* common header for AIFF muxer and demuxer
|
|
*/
|
|
|
|
#ifndef AVFORMAT_AIFF_H
|
|
#define AVFORMAT_AIFF_H
|
|
|
|
#include "avformat.h"
|
|
#include "riff.h"
|
|
|
|
static const AVCodecTag ff_codec_aiff_tags[] = {
|
|
{ CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') },
|
|
{ CODEC_ID_PCM_S8, MKTAG('N','O','N','E') },
|
|
{ CODEC_ID_PCM_S24BE, MKTAG('N','O','N','E') },
|
|
{ CODEC_ID_PCM_S32BE, MKTAG('N','O','N','E') },
|
|
{ CODEC_ID_PCM_F32BE, MKTAG('f','l','3','2') },
|
|
{ CODEC_ID_PCM_F64BE, MKTAG('f','l','6','4') },
|
|
{ CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') },
|
|
{ CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') },
|
|
{ CODEC_ID_MACE3, MKTAG('M','A','C','3') },
|
|
{ CODEC_ID_MACE6, MKTAG('M','A','C','6') },
|
|
{ CODEC_ID_GSM, MKTAG('G','S','M',' ') },
|
|
{ CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') },
|
|
{ CODEC_ID_PCM_S16BE, MKTAG('t','w','o','s') },
|
|
{ CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') },
|
|
{ CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },
|
|
{ CODEC_ID_QDM2, MKTAG('Q','D','M','2') },
|
|
{ CODEC_ID_QCELP, MKTAG('Q','c','l','p') },
|
|
{ CODEC_ID_NONE, 0 },
|
|
};
|
|
|
|
#endif /* AVFORMAT_AIFF_H */
|