![Michael Niedermayer](/assets/img/avatar_default.png)
* commit '43c0a87279e717c1384314c6da7155c306ee7c60': qdm2: check that the FFT size is a power of 2 indeo3: switch parsing the header to bytestream2 indeo3: check motion vectors. rv10: check that extradata is large enough indeo3: fix data size check lavf: make sure stream probe data gets freed. dfa: check for invalid access in decode_wdlt(). xmv: check audio track parameters validity. bmv: check for len being valid in bmv_decode_frame(). xmv: do not leak memory in the error paths in xmv_read_header() avfiltergraph: check for sws opts being non-NULL before using them. oma: Validate sample rates Prepare for 0.8.7 Release Conflicts: RELEASE libavcodec/indeo3.c libavfilter/avfiltergraph.c libavformat/utils.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
35 lines
1.2 KiB
C
35 lines
1.2 KiB
C
/*
|
|
* Sony OpenMG (OMA) common data
|
|
*
|
|
* 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 "internal.h"
|
|
#include "oma.h"
|
|
#include "libavcodec/avcodec.h"
|
|
|
|
const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 };
|
|
|
|
const AVCodecTag ff_oma_codec_tags[] = {
|
|
{ CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 },
|
|
{ CODEC_ID_ATRAC3P, OMA_CODECID_ATRAC3P },
|
|
{ CODEC_ID_MP3, OMA_CODECID_MP3 },
|
|
{ CODEC_ID_PCM_S16BE, OMA_CODECID_LPCM },
|
|
{ 0 },
|
|
};
|
|
|