comparison avcodec.h @ 12490:e1a4ceb96a07 libavcodec

Add R10k decoder. Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by James Darnley, james.darnley gmail, changes by me.
author cehoyos
date Mon, 13 Sep 2010 22:08:51 +0000
parents 5942c42c44e5
children 7220936dc29c
comparison
equal deleted inserted replaced
12489:8cd356429e9f 12490:e1a4ceb96a07
29 #include <errno.h> 29 #include <errno.h>
30 #include "libavutil/avutil.h" 30 #include "libavutil/avutil.h"
31 #include "libavutil/cpu.h" 31 #include "libavutil/cpu.h"
32 32
33 #define LIBAVCODEC_VERSION_MAJOR 52 33 #define LIBAVCODEC_VERSION_MAJOR 52
34 #define LIBAVCODEC_VERSION_MINOR 88 34 #define LIBAVCODEC_VERSION_MINOR 89
35 #define LIBAVCODEC_VERSION_MICRO 0 35 #define LIBAVCODEC_VERSION_MICRO 0
36 36
37 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 37 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
38 LIBAVCODEC_VERSION_MINOR, \ 38 LIBAVCODEC_VERSION_MINOR, \
39 LIBAVCODEC_VERSION_MICRO) 39 LIBAVCODEC_VERSION_MICRO)
225 CODEC_ID_VP8, 225 CODEC_ID_VP8,
226 CODEC_ID_PICTOR, 226 CODEC_ID_PICTOR,
227 CODEC_ID_ANSI, 227 CODEC_ID_ANSI,
228 CODEC_ID_A64_MULTI, 228 CODEC_ID_A64_MULTI,
229 CODEC_ID_A64_MULTI5, 229 CODEC_ID_A64_MULTI5,
230 CODEC_ID_R10K,
230 231
231 /* various PCM "codecs" */ 232 /* various PCM "codecs" */
232 CODEC_ID_PCM_S16LE= 0x10000, 233 CODEC_ID_PCM_S16LE= 0x10000,
233 CODEC_ID_PCM_S16BE, 234 CODEC_ID_PCM_S16BE,
234 CODEC_ID_PCM_U16LE, 235 CODEC_ID_PCM_U16LE,