wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '3bcdf8dcb9'

Browse source 
* commit '3bcdf8dcb9':
  lavc: remove disabled FF_API_SNOW cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-13 11:53:57 +01:00
commit feccf2f6b7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/avcodec.h
View file

@ -156,7 +156,6 @@ enum AVCodecID {
AV_CODEC_ID_MSZH,
AV_CODEC_ID_ZLIB,
AV_CODEC_ID_QTRLE,
AV_CODEC_ID_SNOW,
AV_CODEC_ID_TSCC,
AV_CODEC_ID_ULTI,
AV_CODEC_ID_QDRAW,
@ -292,6 +291,7 @@ enum AVCodecID {
AV_CODEC_ID_SGIRLE = MKBETAG('S','G','I','R'),
AV_CODEC_ID_MVC1 = MKBETAG('M','V','C','1'),
AV_CODEC_ID_MVC2 = MKBETAG('M','V','C','2'),
AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'),
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
@ -574,8 +574,8 @@ enum Motion_Est_ID {
ME_X1, ///< reserved for experiments
ME_HEX, ///< hexagon based search
ME_UMH, ///< uneven multi-hexagon search
ME_ITER, ///< iterative search
ME_TESA, ///< transformed exhaustive search algorithm
ME_ITER=50, ///< iterative search
};
/**

2
libavcodec/old_codec_ids.h
View file

@ -88,7 +88,6 @@
CODEC_ID_MSZH,
CODEC_ID_ZLIB,
CODEC_ID_QTRLE,
CODEC_ID_SNOW,
CODEC_ID_TSCC,
CODEC_ID_ULTI,
CODEC_ID_QDRAW,
@ -213,6 +212,7 @@
CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'),
CODEC_ID_SANM = MKBETAG('S','A','N','M'),
CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'),
CODEC_ID_SNOW = AV_CODEC_ID_SNOW,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs