diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-02 20:45:46 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-02 20:45:46 +0000 |
| commit | 262d1c5d2206467809fd81d841d09ad70cc8ba13 (patch) | |
| tree | 07b02781e1fbf22e5386d45d8f08683c35f9ded2 /libavcore | |
| parent | 7e35d8596b4abdf2331c7fb2bf1a73e8be08c4a8 (diff) | |
| download | ffmpeg-262d1c5d2206467809fd81d841d09ad70cc8ba13.tar.gz | |
Move sample format definitions from libavcodec to libavcore.
Originally committed as revision 25652 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcore')
| -rw-r--r-- | libavcore/Makefile | 1 | ||||
| -rw-r--r-- | libavcore/avcore.h | 4 | ||||
| -rw-r--r-- | libavcore/samplefmt.h | 35 |
3 files changed, 38 insertions, 2 deletions
diff --git a/libavcore/Makefile b/libavcore/Makefile index 5e16c34fbd..97d973fa28 100644 --- a/libavcore/Makefile +++ b/libavcore/Makefile @@ -6,6 +6,7 @@ FFLIBS = avutil HEADERS = avcore.h \ imgutils.h \ parseutils.h \ + samplefmt.h \ OBJS = imgutils.o \ parseutils.o \ diff --git a/libavcore/avcore.h b/libavcore/avcore.h index a77bab84f1..5870817f23 100644 --- a/libavcore/avcore.h +++ b/libavcore/avcore.h @@ -27,8 +27,8 @@ #include "libavutil/avutil.h" #define LIBAVCORE_VERSION_MAJOR 0 -#define LIBAVCORE_VERSION_MINOR 9 -#define LIBAVCORE_VERSION_MICRO 1 +#define LIBAVCORE_VERSION_MINOR 10 +#define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ LIBAVCORE_VERSION_MINOR, \ diff --git a/libavcore/samplefmt.h b/libavcore/samplefmt.h new file mode 100644 index 0000000000..163246b35f --- /dev/null +++ b/libavcore/samplefmt.h @@ -0,0 +1,35 @@ +/* + * 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 AVCORE_SAMPLEFMT_H +#define AVCORE_SAMPLEFMT_H + +/** + * all in native-endian format + */ +enum AVSampleFormat { + AV_SAMPLE_FMT_NONE = -1, + AV_SAMPLE_FMT_U8, ///< unsigned 8 bits + AV_SAMPLE_FMT_S16, ///< signed 16 bits + AV_SAMPLE_FMT_S32, ///< signed 32 bits + AV_SAMPLE_FMT_FLT, ///< float + AV_SAMPLE_FMT_DBL, ///< double + AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if dynamically linking to libavcore +}; + +#endif /* AVCORE_SAMPLEFMT_H */ |