mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02:00
7c29313b38
* qatar/master: APIchanges: fill in revision for AVFrame.age deprecation avcodec: deprecate AVFrame.age 4xm: remove unneeded check for remaining unused data. lavf: force threads to 1 in avformat_find_stream_info() swscale: fix overflows in vertical scaling at top/bottom edges. lavf: add OpenMG audio muxer. omadec: split data that will be used in the muxer to a separate file. lavf: rename oma.c -> omadec.c tmv decoder: set correct pix_fmt Conflicts: Changelog doc/APIchanges libavcodec/mpegvideo.c libavcodec/version.h libavformat/oma.c libavformat/version.h libswscale/swscale.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[6] = { 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 },
|
|
};
|
|
|