Browse Source

lavfi: Move new field to the end of AVFilterContext

This fixes an accidental ABI break introduced at 8688d3a.
tags/n3.2
Timo Rothenpieler 9 years ago
parent
commit
1a75145559
3 changed files with 17 additions and 9 deletions
  1. +8
    -0
      doc/APIchanges
  2. +7
    -7
      libavfilter/avfilter.h
  3. +2
    -2
      libavfilter/version.h

+ 8
- 0
doc/APIchanges View File

@@ -15,6 +15,14 @@ libavutil: 2015-08-28

API changes, most recent first:

2016-06-29 - xxxxxxx - lavfi 6.47.100 - avfilter.h
Fix accidental ABI breakage in AVFilterContext.
ABI was broken in 8688d3a, lavfi 6.42.100 and released as ffmpeg 3.1.

Because of this, ffmpeg and ffplay built against lavfi>=6.42.100 will not be
compatible with lavfi>=6.47.100. Potentially also affects other users of
libavfilter if they are using one of the affected fields.

-------- 8< --------- FFmpeg 3.1 was cut here -------- 8< ---------

2016-06-26 - 481f320 / 1c9e861 - lavu 55.27.100 / 55.13.0 - hwcontext.h


+ 7
- 7
libavfilter/avfilter.h View File

@@ -344,6 +344,13 @@ struct AVFilterContext {
*/
AVFilterInternal *internal;

struct AVFilterCommand *command_queue;

char *enable_str; ///< enable expression string
void *enable; ///< parsed expression (AVExpr*)
double *var_values; ///< variable values for the enable expression
int is_disabled; ///< the enabled state from the last expression evaluation

/**
* For filters which will create hardware frames, sets the device the
* filter should create them in. All other filters will ignore this field:
@@ -352,13 +359,6 @@ struct AVFilterContext {
* hardware context information.
*/
AVBufferRef *hw_device_ctx;

struct AVFilterCommand *command_queue;

char *enable_str; ///< enable expression string
void *enable; ///< parsed expression (AVExpr*)
double *var_values; ///< variable values for the enable expression
int is_disabled; ///< the enabled state from the last expression evaluation
};

/**


+ 2
- 2
libavfilter/version.h View File

@@ -30,8 +30,8 @@
#include "libavutil/version.h"

#define LIBAVFILTER_VERSION_MAJOR 6
#define LIBAVFILTER_VERSION_MINOR 46
#define LIBAVFILTER_VERSION_MICRO 102
#define LIBAVFILTER_VERSION_MINOR 47
#define LIBAVFILTER_VERSION_MICRO 100

#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \


Loading…
Cancel
Save