RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-03 05:13:44 +00:00
Code Issues Projects Releases Wiki Activity

Add CODEC_ID_PRORES and bump lavc minor version

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f5b82f45dc)
This commit is contained in:
Tomas Härdin 2011-02-03 10:47:48 +01:00 committed by Michael Niedermayer
parent d25d1d06a4
commit 6cd67b9f5b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/avcodec.h
View File

@ -32,7 +32,7 @@
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 108 #define LIBAVCODEC_VERSION_MINOR 109
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@ -260,6 +260,7 @@ enum CodecID {
CODEC_ID_R10K, CODEC_ID_R10K,
CODEC_ID_MXPEG, CODEC_ID_MXPEG,
CODEC_ID_LAGARITH, CODEC_ID_LAGARITH,
CODEC_ID_PRORES,
/* various PCM "codecs" */ /* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16LE= 0x10000,