Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:36:54 +0000 (11:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:36:54 +0000 (11:36 +0200)
* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
libavfilter/buffer.c
libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/buffer.c
libavfilter/internal.h

  
  #include "avfilter.h"
  #include "internal.h"
 +#include "audio.h"
 +#include "avcodec.h"
+ #include "version.h"
  
 -/* TODO: buffer pool.  see comment for avfilter_default_get_video_buffer() */
+ #if FF_API_AVFILTERBUFFER
  void ff_avfilter_default_free_buffer(AVFilterBuffer *ptr)
  {
      if (ptr->extended_data != ptr->data)
@@@ -161,7 -174,5 +163,8 @@@ void avfilter_copy_buffer_ref_props(AVF
      case AVMEDIA_TYPE_AUDIO: *dst->audio = *src->audio; break;
      default: break;
      }
 +
 +    av_dict_free(&dst->metadata);
 +    av_dict_copy(&dst->metadata, src->metadata, 0);
  }
+ #endif /* FF_API_AVFILTERBUFFER */
   */
  
  #include "avfilter.h"
 +#include "avfiltergraph.h"
 +#include "formats.h"
  #include "thread.h"
+ #include "version.h"
 +#include "video.h"
 +
 +#define POOL_SIZE 32
 +typedef struct AVFilterPool {
 +    AVFilterBufferRef *pic[POOL_SIZE];
 +    int count;
 +    int refcount;
 +    int draining;
 +} AVFilterPool;
 +
 +typedef struct AVFilterCommand {
 +    double time;                ///< time expressed in seconds
 +    char *command;              ///< command
 +    char *arg;                  ///< optional argument for the command
 +    int flags;
 +    struct AVFilterCommand *next;
 +} AVFilterCommand;
 +
 +/**
 + * Update the position of a link in the age heap.
 + */
 +void ff_avfilter_graph_update_heap(AVFilterGraph *graph, AVFilterLink *link);
  
  #if !FF_API_AVFILTERPAD_PUBLIC
  /**