diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-05-12 17:38:47 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-05-16 13:16:05 +0200 |
| commit | 4d4098da009c8340997b8d1abedbf2062e4aa991 (patch) | |
| tree | 2a2398b82a55b8a5feeaa87ece2fefbd5c83036d /libavfilter/formats.c | |
| parent | 183596fa081cc283c61ba3c0bb8386f9139f761f (diff) | |
lavfi: drop planar/packed negotiation support
The planar/packed switch and the packing_formats list is no longer
required, since the planar/packed information is now stored in the sample
format enum.
This is technically a major API break, possibly it should be not too
painful as we marked the audio filtering API as unstable.
Diffstat (limited to 'libavfilter/formats.c')
| -rw-r--r-- | libavfilter/formats.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 41c6da92b7..3534d64ca7 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -289,6 +289,7 @@ const int64_t avfilter_all_channel_layouts[] = { // return avfilter_make_format64_list(avfilter_all_channel_layouts); // } +#if FF_API_PACKING AVFilterFormats *avfilter_make_all_packing_formats(void) { static const int packing[] = { @@ -299,6 +300,7 @@ AVFilterFormats *avfilter_make_all_packing_formats(void) return avfilter_make_format_list(packing); } +#endif AVFilterFormats *ff_all_samplerates(void) { @@ -518,23 +520,6 @@ int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx) return 0; } -int ff_parse_packing_format(int *ret, const char *arg, void *log_ctx) -{ - char *tail; - int planar = strtol(arg, &tail, 10); - if (*tail) { - planar = !strcmp(arg, "packed") ? 0: - !strcmp(arg, "planar") ? 1: -1; - } - - if (planar != 0 && planar != 1) { - av_log(log_ctx, AV_LOG_ERROR, "Invalid packing format '%s'\n", arg); - return AVERROR(EINVAL); - } - *ret = planar; - return 0; -} - #ifdef TEST #undef printf |