github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'

Browse Source 
* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Conflicts:
	libavcodec/ac3enc_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-12 20:25:48 +02:00
parent 7ed89addb7 dca7ba4bff
commit c600c8e966
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/dv.c
View File

@@ -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