Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
b339182e
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b339182e
编写于
2月 15, 2014
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move all example programs to doc/examples
Also drop support for building examples in library directories.
上级
77fbc032
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
18 addition
and
19 deletion
+18
-19
common.mak
common.mak
+0
-1
configure
configure
+4
-0
doc/Makefile
doc/Makefile
+3
-1
doc/doxy-wrapper.sh
doc/doxy-wrapper.sh
+1
-1
doc/examples/avcodec.c
doc/examples/avcodec.c
+1
-1
doc/examples/metadata.c
doc/examples/metadata.c
+1
-1
doc/examples/output.c
doc/examples/output.c
+1
-1
doc/examples/transcode_aac.c
doc/examples/transcode_aac.c
+1
-1
libavcodec/Makefile
libavcodec/Makefile
+0
-2
libavformat/Makefile
libavformat/Makefile
+0
-2
library.mak
library.mak
+6
-8
未找到文件。
common.mak
浏览文件 @
b339182e
...
...
@@ -14,7 +14,6 @@ TESTPROGS += $(TESTPROGS-yes)
LDLIBS
=
$
(
FFLIBS:%
=
%
$(BUILDSUF)
)
FFEXTRALIBS
:=
$
(
LDLIBS:%
=
$(LD_LIB)
)
$(EXTRALIBS)
EXAMPLES
:=
$
(
EXAMPLES:%
=
$(SUBDIR)
%-example
$(EXESUF)
)
OBJS
:=
$(
sort
$
(
OBJS:%
=
$(SUBDIR)
%
))
TESTOBJS
:=
$
(
TESTOBJS:%
=
$(SUBDIR)
%
)
$
(
TESTPROGS:%
=
$(SUBDIR)
%-test.o
)
TESTPROGS
:=
$
(
TESTPROGS:%
=
$(SUBDIR)
%-test
$(EXESUF)
)
...
...
configure
浏览文件 @
b339182e
...
...
@@ -1095,6 +1095,8 @@ COMPONENT_LIST="
"
EXAMPLE_LIST
=
"
avcodec_example
metadata_example
output_example
transcode_aac_example
"
...
...
@@ -2020,6 +2022,8 @@ ocv_filter_deps="libopencv"
scale_filter_deps
=
"swscale"
# examples
avcodec_example_deps
=
"avcodec avutil"
metadata_example_deps
=
"avformat avutil"
output_example_deps
=
"avcodec avformat avutil swscale"
transcode_aac_example_deps
=
"avcodec avformat avresample"
...
...
doc/Makefile
浏览文件 @
b339182e
...
...
@@ -15,9 +15,11 @@ DOCS-$(CONFIG_POD2MAN) += $(MANPAGES) $(PODPAGES)
DOCS-$(CONFIG_TEXI2HTML)
+=
$(HTMLPAGES)
DOCS
=
$
(
DOCS-yes
)
DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE)
+=
avcodec
DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE)
+=
metadata
DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE)
+=
output
DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)
+=
transcode_aac
ALL_DOC_EXAMPLES
=
output transcode_aac
ALL_DOC_EXAMPLES
=
avcodec metadata
output transcode_aac
DOC_EXAMPLES
:=
$
(
DOC_EXAMPLES-yes:%
=
doc/examples/%
$(EXESUF)
)
ALL_DOC_EXAMPLES
:=
$
(
ALL_DOC_EXAMPLES:%
=
doc/examples/%
$(EXESUF)
)
...
...
doc/doxy-wrapper.sh
浏览文件 @
b339182e
...
...
@@ -8,7 +8,7 @@ shift 2
doxygen -
<<
EOF
@INCLUDE =
${
DOXYFILE
}
INPUT =
$@
EXAMPLE_PATH =
${
SRC_PATH
}
/
EXAMPLE_PATH =
${
SRC_PATH
}
/
doc/examples
HTML_HEADER =
${
SRC_PATH
}
/doc/doxy/header.html
HTML_FOOTER =
${
SRC_PATH
}
/doc/doxy/footer.html
HTML_STYLESHEET =
${
SRC_PATH
}
/doc/doxy/doxy_stylesheet.css
...
...
libavcodec/api-example
.c
→
doc/examples/avcodec
.c
浏览文件 @
b339182e
...
...
@@ -22,7 +22,7 @@
* @file
* libavcodec API use example.
*
* @example
libavcodec/api-example
.c
* @example
avcodec
.c
* Note that this library only handles codecs (mpeg, mpeg4, etc...),
* not file formats (avi, vob, etc...). See library 'libavformat' for the
* format handling
...
...
libavformat/metadata-example
.c
→
doc/examples/metadata
.c
浏览文件 @
b339182e
...
...
@@ -22,7 +22,7 @@
/**
* @file
* @example
libavformat/metadata-example
.c
* @example
metadata
.c
* Shows how the metadata API can be used in application programs.
*/
...
...
doc/examples/output.c
浏览文件 @
b339182e
...
...
@@ -24,7 +24,7 @@
* @file
* libavformat API example.
*
* @example
doc/examples/
output.c
* @example output.c
* Output a media file in any supported libavformat format. The default
* codecs are used.
*/
...
...
doc/examples/transcode_aac.c
浏览文件 @
b339182e
...
...
@@ -20,7 +20,7 @@
* @file
* simple audio converter
*
* @example
doc/examples/
transcode_aac.c
* @example transcode_aac.c
* Convert an input audio file to AAC in an MP4 container using Libav.
* @author Andreas Unterweger (dustsigns@gmail.com)
*/
...
...
libavcodec/Makefile
浏览文件 @
b339182e
...
...
@@ -697,8 +697,6 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA)
+=
vda.h
SKIPHEADERS-$(CONFIG_VDPAU)
+=
vdpau.h vdpau_internal.h
EXAMPLES
=
api
TESTPROGS
=
dct
\
fft
\
fft-fixed
\
...
...
libavformat/Makefile
浏览文件 @
b339182e
...
...
@@ -392,8 +392,6 @@ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL)
+=
rtmpdh.h
SKIPHEADERS-$(CONFIG_NETWORK)
+=
network.h rtsp.h
EXAMPLES
=
metadata
\
TESTPROGS
=
seek
\
srtp
\
url
\
...
...
library.mak
浏览文件 @
b339182e
...
...
@@ -5,7 +5,6 @@ LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
LIBMINOR
:=
$
(
lib
$(NAME)
_VERSION_MINOR
)
INCINSTDIR
:=
$(INCDIR)
/lib
$(NAME)
LIB_EXAMPLES
:=
$(LIB_EXAMPLES)
$(EXAMPLES)
INSTHEADERS
:=
$(INSTHEADERS)
$
(
HEADERS:%
=
$(SUBDIR)
%
)
all-$(CONFIG_STATIC)
:
$(SUBDIR)$(LIBNAME)
...
...
@@ -43,10 +42,10 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
install-libs-$(CONFIG_SHARED)
:
install-lib$(NAME)-shared
define
RULES
$(
EXAMPLES) $(TOOLS)
:
THISLIB = $(FULLNAME:%=$(LD_LIB))
$(
TOOLS)
:
THISLIB = $(FULLNAME:%=$(LD_LIB))
$(TESTPROGS)
:
THISLIB = $(SUBDIR)$(LIBNAME)
$(
EXAMPLES) $(
TESTPROGS) $(TOOLS)
:
%$(EXESUF): %.o $(EXEOBJS)
$(TESTPROGS) $(TOOLS)
:
%$(EXESUF): %.o $(EXEOBJS)
$
$(LD)
$(LDFLAGS)
$
$(LD_O)
$
$(
filter
%.o,
$$
^
)
$
$(THISLIB)
$(FFEXTRALIBS)
$
$(ELIBS)
$(SUBDIR)$(SLIBNAME)
:
$(SUBDIR)$(SLIBNAME_WITH_MAJOR)
...
...
@@ -58,7 +57,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)
$(SLIB_EXTRA_CMD)
clean
::
$(RM)
$(
addprefix
$(SUBDIR)
,
*
-
example
$(EXESUF)
*
-
test
$(EXESUF)
$(CLEANFILES)
$(CLEANSUFFIXES)
$(LIBSUFFIXES)
)
\
$(RM)
$(
addprefix
$(SUBDIR)
,
*
-test
$(EXESUF)
$(CLEANFILES)
$(CLEANSUFFIXES)
$(LIBSUFFIXES)
)
\
$
(
CLEANSUFFIXES:%
=
$(SUBDIR)$(ARCH)
/%
)
distclean
::
clean
...
...
@@ -101,8 +100,7 @@ endef
$(eval
$(RULES))
$(
EXAMPLES) $(TOOLS)
:
$(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
$(
TOOLS)
:
$(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
$(TESTPROGS)
:
$(DEP_LIBS) $(SUBDIR)$(LIBNAME)
examples
:
$(EXAMPLES)
testprogs
:
$(TESTPROGS)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录