Revision 262d1c5d

View differences:

doc/APIchanges
13 13

  
14 14
API changes, most recent first:
15 15

  
16
2010-11-02 - r25652 - lavcore 0.10.0 - samplefmt.h
17
  Define enum AVSampleFormat in libavcore/samplefmt.h, deprecate enum
18
  SampleFormat.
19

  
16 20
2010-10-16 - r25502 - lavfi 1.52.0 - avfilter_graph_config()
17 21
  Add the function avfilter_graph_config() in avfiltergraph.h.
18 22

  
libavcodec/avcodec.h
27 27
 */
28 28

  
29 29
#include <errno.h>
30
#include "libavcore/samplefmt.h"
30 31
#include "libavutil/avutil.h"
31 32
#include "libavutil/cpu.h"
32 33

  
33 34
#define LIBAVCODEC_VERSION_MAJOR 52
34 35
#define LIBAVCODEC_VERSION_MINOR 94
35
#define LIBAVCODEC_VERSION_MICRO  0
36
#define LIBAVCODEC_VERSION_MICRO  1
36 37

  
37 38
#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
38 39
                                               LIBAVCODEC_VERSION_MINOR, \
......
75 76
#ifndef FF_API_INOFFICIAL
76 77
#define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)
77 78
#endif
79
#ifndef FF_API_OLD_SAMPLE_FMT
80
#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 53)
81
#endif
78 82

  
79 83
#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
80 84
#define AV_TIME_BASE            1000000
......
410 414
#define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
411 415
#endif
412 416

  
413
/**
414
 * all in native-endian format
415
 */
416
enum SampleFormat {
417
    SAMPLE_FMT_NONE = -1,
418
    SAMPLE_FMT_U8,              ///< unsigned 8 bits
419
    SAMPLE_FMT_S16,             ///< signed 16 bits
420
    SAMPLE_FMT_S32,             ///< signed 32 bits
421
    SAMPLE_FMT_FLT,             ///< float
422
    SAMPLE_FMT_DBL,             ///< double
423
    SAMPLE_FMT_NB               ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec
424
};
417
#if FF_API_OLD_SAMPLE_FMT
418
#define SampleFormat AVSampleFormat
419

  
420
#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
421
#define SAMPLE_FMT_U8   AV_SAMPLE_FMT_U8
422
#define SAMPLE_FMT_S16  AV_SAMPLE_FMT_S16
423
#define SAMPLE_FMT_S32  AV_SAMPLE_FMT_S32
424
#define SAMPLE_FMT_FLT  AV_SAMPLE_FMT_FLT
425
#define SAMPLE_FMT_DBL  AV_SAMPLE_FMT_DBL
426
#define SAMPLE_FMT_NB   AV_SAMPLE_FMT_NB
427
#endif
425 428

  
426 429
/* Audio channel masks */
427 430
#define CH_FRONT_LEFT             0x00000001
libavcore/Makefile
6 6
HEADERS = avcore.h                                                      \
7 7
          imgutils.h                                                    \
8 8
          parseutils.h                                                  \
9
          samplefmt.h                                                   \
9 10

  
10 11
OBJS = imgutils.o                                                       \
11 12
       parseutils.o                                                     \
libavcore/avcore.h
27 27
#include "libavutil/avutil.h"
28 28

  
29 29
#define LIBAVCORE_VERSION_MAJOR  0
30
#define LIBAVCORE_VERSION_MINOR  9
31
#define LIBAVCORE_VERSION_MICRO  1
30
#define LIBAVCORE_VERSION_MINOR 10
31
#define LIBAVCORE_VERSION_MICRO  0
32 32

  
33 33
#define LIBAVCORE_VERSION_INT   AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
34 34
                                               LIBAVCORE_VERSION_MINOR, \
libavcore/samplefmt.h
1
/*
2
 * This file is part of FFmpeg.
3
 *
4
 * FFmpeg is free software; you can redistribute it and/or
5
 * modify it under the terms of the GNU Lesser General Public
6
 * License as published by the Free Software Foundation; either
7
 * version 2.1 of the License, or (at your option) any later version.
8
 *
9
 * FFmpeg is distributed in the hope that it will be useful,
10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
12
 * Lesser General Public License for more details.
13
 *
14
 * You should have received a copy of the GNU Lesser General Public
15
 * License along with FFmpeg; if not, write to the Free Software
16
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
 */
18

  
19
#ifndef AVCORE_SAMPLEFMT_H
20
#define AVCORE_SAMPLEFMT_H
21

  
22
/**
23
 * all in native-endian format
24
 */
25
enum AVSampleFormat {
26
    AV_SAMPLE_FMT_NONE = -1,
27
    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
28
    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
29
    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
30
    AV_SAMPLE_FMT_FLT,         ///< float
31
    AV_SAMPLE_FMT_DBL,         ///< double
32
    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if dynamically linking to libavcore
33
};
34

  
35
#endif /* AVCORE_SAMPLEFMT_H */

Also available in: Unified diff