diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 22:25:48 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 22:25:48 +0400 |
commit | c600c8e966996555724d574e26f9e95259b1f884 (patch) | |
tree | 46adfa676b96c7676e156f37394fe405cf9cf7b1 /libavformat/dv.c | |
parent | 7ed89addb7f6271d17c2ba21ec11204e37fa9917 (diff) | |
parent | dca7ba4bffe3e4aeb620cb62955256a0d87561f4 (diff) |
Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs
Conflicts:
libavcodec/ac3enc_float.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dv.c')
-rw-r--r-- | libavformat/dv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c index 4a32dd1e47..8bc26ae238 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -1,5 +1,5 @@ /* - * General DV muxer/demuxer + * General DV demuxer * Copyright (c) 2003 Roman Shaposhnik * * Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth @@ -622,7 +622,6 @@ static int dv_probe(AVProbeData *p) return 0; } -#if CONFIG_DV_DEMUXER AVInputFormat ff_dv_demuxer = { .name = "dv", .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), @@ -634,4 +633,3 @@ AVInputFormat ff_dv_demuxer = { .read_seek = dv_read_seek, .extensions = "dv,dif", }; -#endif |