diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:31:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:52:42 +0100 |
| commit | 2439f2ca82e28aa38b8aa2512bdb5a328e946cb9 (patch) | |
| tree | f180b9a7b9e8159ecba10a487dfb1bcc9824499c /libavformat/options.c | |
| parent | a17479dfce67fbea2d0a1bf303010dce1e79059f (diff) | |
| download | ffmpeg-2439f2ca82e28aa38b8aa2512bdb5a328e946cb9.tar.gz | |
lavf: remove disabled FF_API_OLD_AVIO cruft
Diffstat (limited to 'libavformat/options.c')
| -rw-r--r-- | libavformat/options.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/options.c b/libavformat/options.c index 7c75bf48fc..32cd43adb5 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -41,10 +41,8 @@ static void *format_child_next(void *obj, void *prev) ((s->iformat && s->iformat->priv_class) || s->oformat && s->oformat->priv_class)) return s->priv_data; -#if !FF_API_OLD_AVIO if (s->pb && s->pb->av_class && prev != s->pb) return s->pb; -#endif return NULL; } @@ -54,11 +52,7 @@ static const AVClass *format_child_class_next(const AVClass *prev) AVOutputFormat *ofmt = NULL; if (!prev) -#if !FF_API_OLD_AVIO return &ffio_url_class; -#else - prev = (void *)&ifmt; // Dummy pointer; -#endif while ((ifmt = av_iformat_next(ifmt))) if (ifmt->priv_class == prev) |