virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

Browse Source 
* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-01 11:36:54 +02:00
commit 0c8efe4891
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/buffer.c
View File

@ -30,7 +30,9 @@
#include "internal.h" #include "internal.h"
#include "audio.h" #include "audio.h"
#include "avcodec.h" #include "avcodec.h"
#include "version.h"
#if FF_API_AVFILTERBUFFER
void ff_avfilter_default_free_buffer(AVFilterBuffer *ptr) void ff_avfilter_default_free_buffer(AVFilterBuffer *ptr)
{ {
if (ptr->extended_data != ptr->data) if (ptr->extended_data != ptr->data)
@ -165,3 +167,4 @@ void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *s
av_dict_free(&dst->metadata); av_dict_free(&dst->metadata);
av_dict_copy(&dst->metadata, src->metadata, 0); av_dict_copy(&dst->metadata, src->metadata, 0);
} }
#endif /* FF_API_AVFILTERBUFFER */

3
libavfilter/internal.h
View File

@ -28,6 +28,7 @@
#include "avfiltergraph.h" #include "avfiltergraph.h"
#include "formats.h" #include "formats.h"
#include "thread.h" #include "thread.h"
#include "version.h"
#include "video.h" #include "video.h"
#define POOL_SIZE 32 #define POOL_SIZE 32
@ -153,8 +154,10 @@ struct AVFilterInternal {
int *ret, int nb_jobs); int *ret, int nb_jobs);
}; };
#if FF_API_AVFILTERBUFFER
/** default handler for freeing audio/video buffer when there are no references left */ /** default handler for freeing audio/video buffer when there are no references left */
void ff_avfilter_default_free_buffer(AVFilterBuffer *buf); void ff_avfilter_default_free_buffer(AVFilterBuffer *buf);
#endif
/** Tell is a format is contained in the provided list terminated by -1. */ /** Tell is a format is contained in the provided list terminated by -1. */
int ff_fmt_is_in(int fmt, const int *fmts); int ff_fmt_is_in(int fmt, const int *fmts);