diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:53:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:53:57 +0100 |
| commit | feccf2f6b747e433766464e8a8b215cbe70c5f27 (patch) | |
| tree | fa169b3b674e6b9606b72141cf02f3997ca60c74 | |
| parent | b3b46cd74e9facb40d18c40de23b0f0ada1a48d4 (diff) | |
| parent | 3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00 (diff) | |
| download | ffmpeg-feccf2f6b747e433766464e8a8b215cbe70c5f27.tar.gz | |
Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'
* commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
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>
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/old_codec_ids.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1423bef50a..87129a5764 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 }; /** diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h index ded4cc7877..7492542bfa 100644 --- a/libavcodec/old_codec_ids.h +++ b/libavcodec/old_codec_ids.h @@ -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 |