diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 11:04:40 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 11:04:40 +0000 |
| commit | 5d6e4c160a4a0d71c17e8428123027c747ff0fb3 (patch) | |
| tree | d3132b2b615fe19f3f4b5ad43b095c076320c780 /libavfilter | |
| parent | 09f47fa44ebf3f18651397517b49e6f8c5a0e374 (diff) | |
| download | ffmpeg-5d6e4c160a4a0d71c17e8428123027c747ff0fb3.tar.gz | |
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 8 | ||||
| -rw-r--r-- | libavfilter/defaults.c | 4 | ||||
| -rw-r--r-- | libavfilter/formats.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index fa15b35bde..e8f536a102 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -115,7 +115,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, link->srcpad = &src->output_pads[srcpad]; link->dstpad = &dst->input_pads[dstpad]; link->type = src->output_pads[srcpad].type; - assert(PIX_FMT_NONE == -1 && SAMPLE_FMT_NONE == -1); + assert(PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1); link->format = -1; return 0; @@ -268,7 +268,7 @@ AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int } AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, - enum SampleFormat sample_fmt, int size, + enum AVSampleFormat sample_fmt, int size, int64_t channel_layout, int planar) { AVFilterBufferRef *ret = NULL; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 5ee7887922..5583a141b7 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -366,7 +366,7 @@ struct AVFilterPad { * Input audio pads only. */ AVFilterBufferRef *(*get_audio_buffer)(AVFilterLink *link, int perms, - enum SampleFormat sample_fmt, int size, + enum AVSampleFormat sample_fmt, int size, int64_t channel_layout, int planar); /** @@ -455,7 +455,7 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, /** default handler for get_audio_buffer() for audio inputs */ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int perms, - enum SampleFormat sample_fmt, int size, + enum AVSampleFormat sample_fmt, int size, int64_t channel_layout, int planar); /** @@ -486,7 +486,7 @@ AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link, /** get_audio_buffer() handler for filters which simply pass audio along */ AVFilterBufferRef *avfilter_null_get_audio_buffer(AVFilterLink *link, int perms, - enum SampleFormat sample_fmt, int size, + enum AVSampleFormat sample_fmt, int size, int64_t channel_layout, int planar); /** @@ -662,7 +662,7 @@ AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, * avfilter_unref_buffer when you are finished with it. */ AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, - enum SampleFormat sample_fmt, int size, + enum AVSampleFormat sample_fmt, int size, int64_t channel_layout, int planar); /** diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 5462b1a34a..388d12c15e 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -82,7 +82,7 @@ fail: } AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int perms, - enum SampleFormat sample_fmt, int size, + enum AVSampleFormat sample_fmt, int size, int64_t channel_layout, int planar) { AVFilterBuffer *samples = av_mallocz(sizeof(AVFilterBuffer)); @@ -318,7 +318,7 @@ AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link, int perms, } AVFilterBufferRef *avfilter_null_get_audio_buffer(AVFilterLink *link, int perms, - enum SampleFormat sample_fmt, int size, + enum AVSampleFormat sample_fmt, int size, int64_t channel_layout, int packed) { return avfilter_get_audio_buffer(link->dst->outputs[0], perms, sample_fmt, diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 5e65c2968d..f53d6baf62 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -108,7 +108,7 @@ AVFilterFormats *avfilter_all_formats(enum AVMediaType type) AVFilterFormats *ret = NULL; int fmt; int num_formats = type == AVMEDIA_TYPE_VIDEO ? PIX_FMT_NB : - type == AVMEDIA_TYPE_AUDIO ? SAMPLE_FMT_NB : 0; + type == AVMEDIA_TYPE_AUDIO ? AV_SAMPLE_FMT_NB : 0; for (fmt = 0; fmt < num_formats; fmt++) if ((type != AVMEDIA_TYPE_VIDEO) || |