/**
- * @file flv.h
+ * @file
* FLV common header
*
- * Copyright (c) 2006 The FFmpeg Project.
+ * Copyright (c) 2006 The Libav Project
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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,
+ * Libav 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
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FFMPEG_FLV_H
-#define FFMPEG_FLV_H
+#ifndef AVFORMAT_FLV_H
+#define AVFORMAT_FLV_H
/* offsets for packed values */
#define FLV_AUDIO_SAMPLESSIZE_OFFSET 1
};
enum {
- FLV_CODECID_PCM = 0,
- FLV_CODECID_ADPCM = 1 << FLV_AUDIO_CODECID_OFFSET,
- FLV_CODECID_MP3 = 2 << FLV_AUDIO_CODECID_OFFSET,
- FLV_CODECID_PCM_LE = 3 << FLV_AUDIO_CODECID_OFFSET,
- FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
- FLV_CODECID_NELLYMOSER = 6 << FLV_AUDIO_CODECID_OFFSET,
- FLV_CODECID_AAC = 10<< FLV_AUDIO_CODECID_OFFSET,
- FLV_CODECID_SPEEX = 11<< FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_PCM = 0,
+ FLV_CODECID_ADPCM = 1 << FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_MP3 = 2 << FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_PCM_LE = 3 << FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_NELLYMOSER_16KHZ_MONO = 4 << FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_NELLYMOSER_8KHZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_NELLYMOSER = 6 << FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_AAC = 10<< FLV_AUDIO_CODECID_OFFSET,
+ FLV_CODECID_SPEEX = 11<< FLV_AUDIO_CODECID_OFFSET,
};
enum {
AMF_DATA_TYPE_UNDEFINED = 0x06,
AMF_DATA_TYPE_REFERENCE = 0x07,
AMF_DATA_TYPE_MIXEDARRAY = 0x08,
+ AMF_DATA_TYPE_OBJECT_END = 0x09,
AMF_DATA_TYPE_ARRAY = 0x0a,
AMF_DATA_TYPE_DATE = 0x0b,
+ AMF_DATA_TYPE_LONG_STRING = 0x0c,
AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
} AMFDataType;
-#endif /* FFMPEG_FLV_H */
+#endif /* AVFORMAT_FLV_H */