History

Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400': lavc: make the xvid-specific "gmc" flag a private option of libxvid Conflicts: libavcodec/libxvid.c libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit e40ae8c2 parents 1851643 64841495 files · +23 −2Browse files

Unified · Split

5 files
  1. doc/APIchanges +4 −0
  2. libavcodec/avcodec.h +5 −0
  3. libavcodec/libxvid.c +8 −1
  4. libavcodec/options_table.h +2 −0
  5. libavcodec/version.h +4 −1
doc/APIchanges+4−0
@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15 15
16API changes, most recent first:16API changes, most recent first:
17 17
182014-04-xx - xxxxxxx - lavc 55.50.2 - avcodec.h
19 Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the
20 libxvid encoder.
21
182014-04-xx - xxxxxxx - lavc 55.50.1 - avcodec.h222014-04-xx - xxxxxxx - lavc 55.50.1 - avcodec.h
19 Deprecate CODEC_FLAG_NORMALIZE_AQP. It is replaced by the flag "naq" in the23 Deprecate CODEC_FLAG_NORMALIZE_AQP. It is replaced by the flag "naq" in the
20 "mpv_flags" private option of the mpegvideo encoders.24 "mpv_flags" private option of the mpegvideo encoders.
libavcodec/avcodec.h+5−0
@@ -745,7 +745,12 @@ typedef struct RcOverride{ · 744 unmodified lines
745#define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced prediction for H.263.745#define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced prediction for H.263.
746#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted746#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
747#define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.747#define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.
748#if FF_API_GMC
749/**
750 * @deprecated use the "gmc" private option of the libxvid encoder
751 */
748#define CODEC_FLAG_GMC 0x0020 ///< Use GMC.752#define CODEC_FLAG_GMC 0x0020 ///< Use GMC.
753#endif
749#define CODEC_FLAG_MV0 0x0040 ///< Always try a MB with MV=<0,0>.754#define CODEC_FLAG_MV0 0x0040 ///< Always try a MB with MV=<0,0>.
750#if FF_API_INPUT_PRESERVED755#if FF_API_INPUT_PRESERVED
751/**756/**
libavcodec/libxvid.c+8−1
@@ -67,6 +67,7 @@ struct xvid_context { · 66 unmodified lines
67 int variance_aq; /**< Variance adaptive quantization */67 int variance_aq; /**< Variance adaptive quantization */
68 int ssim; /**< SSIM information display mode */68 int ssim; /**< SSIM information display mode */
69 int ssim_acc; /**< SSIM accuracy. 0: accurate. 4: fast. */69 int ssim_acc; /**< SSIM accuracy. 0: accurate. 4: fast. */
70 int gmc;
70};71};
71 72
72/**73/**
@@ -422,8 +423,13 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { · 349 unmodified lines
422 }423 }
423 424
424 /* Bring in VOL flags from ffmpeg command-line */425 /* Bring in VOL flags from ffmpeg command-line */
426#if FF_API_GMC
427 if (avctx->flags & CODEC_FLAG_GMC)
428 x->gmc = 1;
429#endif
430
425 x->vol_flags = 0;431 x->vol_flags = 0;
426 if( xvid_flags & CODEC_FLAG_GMC ) {432 if (x->gmc) {
427 x->vol_flags |= XVID_VOL_GMC;433 x->vol_flags |= XVID_VOL_GMC;
428 x->me_flags |= XVID_ME_GME_REFINE;434 x->me_flags |= XVID_ME_GME_REFINE;
429 }435 }
@@ -815,6 +821,7 @@ static const AVOption options[] = { · 385 unmodified lines
815 { "avg", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "ssim" },821 { "avg", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "ssim" },
816 { "frame", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "ssim" },822 { "frame", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "ssim" },
817 { "ssim_acc", "SSIM accuracy", OFFSET(ssim_acc), AV_OPT_TYPE_INT, { .i64 = 2 }, 0, 4, VE },823 { "ssim_acc", "SSIM accuracy", OFFSET(ssim_acc), AV_OPT_TYPE_INT, { .i64 = 2 }, 0, 4, VE },
824 { "gmc", "use GMC", OFFSET(gmc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
818 { NULL },825 { NULL },
819};826};
820 827
libavcodec/options_table.h+2−0
@@ -54,7 +54,9 @@ static const AVOption avcodec_options[] = { · 53 unmodified lines
54{"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},54{"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},
55{"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},55{"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},
56{"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},56{"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},
57#if FF_API_GMC
57{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, INT_MAX, V|E, "flags"},58{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, INT_MAX, V|E, "flags"},
59#endif
58{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},60{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},
59#if FF_API_INPUT_PRESERVED61#if FF_API_INPUT_PRESERVED
60{"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"},62{"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"},
libavcodec/version.h+4−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
30 30
31#define LIBAVCODEC_VERSION_MAJOR 5531#define LIBAVCODEC_VERSION_MAJOR 55
32#define LIBAVCODEC_VERSION_MINOR 6032#define LIBAVCODEC_VERSION_MINOR 60
33#define LIBAVCODEC_VERSION_MICRO 10133#define LIBAVCODEC_VERSION_MICRO 102
34 34
35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
36 LIBAVCODEC_VERSION_MINOR, \36 LIBAVCODEC_VERSION_MINOR, \
@@ -153,5 +153,8 @@ · 116 unmodified lines
153#ifndef FF_API_NORMALIZE_AQP153#ifndef FF_API_NORMALIZE_AQP
154#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 57)154#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 57)
155#endif155#endif
156#ifndef FF_API_GMC
157#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 57)
158#endif
156 159
157#endif /* AVCODEC_VERSION_H */160#endif /* AVCODEC_VERSION_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t