Browse Source

Move AVMediaType from libavcodec to libavutil.

This allows applications/libraries which require that symbol
(e.g. libavfilter) to be compiled without to depend on the presence of
libavcodec/avcodec.h, which may not be installed.

Originally committed as revision 22736 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Stefano Sabatini 16 years ago
parent
commit
11491503c4
2 changed files with 11 additions and 11 deletions
  1. +0
    -10
      libavcodec/avcodec.h
  2. +11
    -1
      libavutil/avutil.h

+ 0
- 10
libavcodec/avcodec.h View File

@@ -355,16 +355,6 @@ enum CodecID {
* stream (only used by libavformat) */
};

enum AVMediaType {
AVMEDIA_TYPE_UNKNOWN = -1,
AVMEDIA_TYPE_VIDEO,
AVMEDIA_TYPE_AUDIO,
AVMEDIA_TYPE_DATA,
AVMEDIA_TYPE_SUBTITLE,
AVMEDIA_TYPE_ATTACHMENT,
AVMEDIA_TYPE_NB
};

#if LIBAVCODEC_VERSION_MAJOR < 53
#define CodecType AVMediaType



+ 11
- 1
libavutil/avutil.h View File

@@ -40,7 +40,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)

#define LIBAVUTIL_VERSION_MAJOR 50
#define LIBAVUTIL_VERSION_MINOR 13
#define LIBAVUTIL_VERSION_MINOR 14
#define LIBAVUTIL_VERSION_MICRO 0

#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -68,6 +68,16 @@ const char *avutil_configuration(void);
*/
const char *avutil_license(void);

enum AVMediaType {
AVMEDIA_TYPE_UNKNOWN = -1,
AVMEDIA_TYPE_VIDEO,
AVMEDIA_TYPE_AUDIO,
AVMEDIA_TYPE_DATA,
AVMEDIA_TYPE_SUBTITLE,
AVMEDIA_TYPE_ATTACHMENT,
AVMEDIA_TYPE_NB
};

#include "common.h"
#include "error.h"
#include "mathematics.h"


Loading…
Cancel
Save