Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
f8904fd9
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,发现更多精彩内容 >>
提交
f8904fd9
编写于
1月 06, 2007
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename variables: a52 --> liba52, a52bin --> liba52bin
Originally committed as revision 7414 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
bfd5afd8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
18 deletion
+18
-18
configure
configure
+11
-11
libavcodec/Makefile
libavcodec/Makefile
+2
-2
libavcodec/a52dec.c
libavcodec/a52dec.c
+4
-4
libavcodec/allcodecs.c
libavcodec/allcodecs.c
+1
-1
未找到文件。
configure
浏览文件 @
f8904fd9
...
...
@@ -74,7 +74,7 @@ show_help(){
echo
" --enable-x264 enable H.264 encoding via x264 [default=no]"
echo
" --enable-mingw32 enable MinGW native/cross Windows compile"
echo
" --enable-mingwce enable MinGW native/cross WinCE compile"
echo
" --enable-a52 enable GPLed
A
52 support [default=no]"
echo
" --enable-a52 enable GPLed
liba
52 support [default=no]"
echo
" --enable-a52bin open liba52.so.0 at runtime [default=no]"
echo
" --enable-dts enable GPLed DTS support [default=no]"
echo
" --enable-pp enable GPLed postprocessing support [default=no]"
...
...
@@ -407,8 +407,6 @@ CONFIG_LIST='
parsers
muxers
demuxers
a52
a52bin
amr
amr_nb
amr_nb_fixed
...
...
@@ -429,6 +427,8 @@ CONFIG_LIST='
ffserver
gpl
ipv6
liba52
liba52bin
libgsm
libnut
libogg
...
...
@@ -590,6 +590,8 @@ dc1394="no"
network
=
"yes"
ipv6
=
"yes"
zlib
=
"yes"
liba52
=
"no"
liba52bin
=
"no"
libgsm
=
"no"
mp3lame
=
"no"
libnut
=
"no"
...
...
@@ -600,8 +602,6 @@ faadbin="no"
faac
=
"no"
xvid
=
"no"
x264
=
"no"
a52
=
"no"
a52bin
=
"no"
dts
=
"no"
pp
=
"no"
mingw32
=
"no"
...
...
@@ -934,9 +934,9 @@ for opt do
;;
--disable-zlib
)
zlib
=
"no"
;;
--enable-a52
)
a52
=
"yes"
--enable-a52
)
lib
a52
=
"yes"
;;
--enable-a52bin
)
a52bin
=
"yes"
--enable-a52bin
)
lib
a52bin
=
"yes"
;;
--enable-dts
)
dts
=
"yes"
;;
...
...
@@ -1132,7 +1132,7 @@ if test "$gpl" != "yes"; then
die
"The Postprocessing code is under GPL and --enable-gpl is not specified."
fi
if
test
"
$
a52
"
!=
"no"
-o
"
$
a52bin
"
!=
"no"
;
then
if
test
"
$
liba52
"
!=
"no"
-o
"
$lib
a52bin
"
!=
"no"
;
then
die
"liba52 is under GPL and --enable-gpl is not specified."
fi
...
...
@@ -1550,7 +1550,7 @@ if test "$vhook" = "default"; then
vhook
=
"
$dlopen
"
fi
if
enabled_any vhook a52bin faadbin
;
then
if
enabled_any vhook
lib
a52bin faadbin
;
then
add_extralibs
$ldl
fi
...
...
@@ -1792,8 +1792,8 @@ if test $sdl_too_old = "yes"; then
fi
echo
"Sun medialib support
$mlib
"
echo
"AVISynth enabled
$avisynth
"
echo
"liba52 support
$a52
"
echo
"liba52 dlopened
$a52bin
"
echo
"liba52 support
$
lib
a52
"
echo
"liba52 dlopened
$
lib
a52bin
"
echo
"libdts support
$dts
"
echo
"libfaac enabled
$faac
"
echo
"libfaad enabled
$faad
"
...
...
libavcodec/Makefile
浏览文件 @
f8904fd9
...
...
@@ -252,10 +252,10 @@ OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o
OBJS-$(CONFIG_LIBGSM)
+=
libgsm.o
# currently using liba52 for ac3 decoding
OBJS-$(CONFIG_
A52)
+=
a52dec.o
OBJS-$(CONFIG_
LIBA52)
+=
a52dec.o
# using builtin liba52 or runtime linked liba52.so.0
OBJS-$(CONFIG_
A52)$(CONFIG_A52BIN)
+=
liba52/bit_allocate.o
\
OBJS-$(CONFIG_
LIBA52)$(CONFIG_LIBA52BIN)
+=
liba52/bit_allocate.o
\
liba52/bitstream.o
\
liba52/downmix.o
\
liba52/imdct.o
\
...
...
libavcodec/a52dec.c
浏览文件 @
f8904fd9
...
...
@@ -27,7 +27,7 @@
#include "avcodec.h"
#include "liba52/a52.h"
#ifdef CONFIG_A52BIN
#ifdef CONFIG_
LIB
A52BIN
#include <dlfcn.h>
static
const
char
*
liba52name
=
"liba52.so.0"
;
#endif
...
...
@@ -70,7 +70,7 @@ typedef struct AC3DecodeState {
}
AC3DecodeState
;
#ifdef CONFIG_A52BIN
#ifdef CONFIG_
LIB
A52BIN
static
void
*
dlsymm
(
void
*
handle
,
const
char
*
symbol
)
{
void
*
f
=
dlsym
(
handle
,
symbol
);
...
...
@@ -84,7 +84,7 @@ static int a52_decode_init(AVCodecContext *avctx)
{
AC3DecodeState
*
s
=
avctx
->
priv_data
;
#ifdef CONFIG_A52BIN
#ifdef CONFIG_
LIB
A52BIN
s
->
handle
=
dlopen
(
liba52name
,
RTLD_LAZY
);
if
(
!
s
->
handle
)
{
...
...
@@ -239,7 +239,7 @@ static int a52_decode_end(AVCodecContext *avctx)
{
AC3DecodeState
*
s
=
avctx
->
priv_data
;
s
->
a52_free
(
s
->
state
);
#ifdef CONFIG_A52BIN
#ifdef CONFIG_
LIB
A52BIN
dlclose
(
s
->
handle
);
#endif
return
0
;
...
...
libavcodec/allcodecs.c
浏览文件 @
f8904fd9
...
...
@@ -164,7 +164,7 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
AAC
,
aac
);
REGISTER_DECODER
(
MPEG4AAC
,
mpeg4aac
);
#endif
#ifdef CONFIG_A52
#ifdef CONFIG_
LIB
A52
REGISTER_DECODER
(
AC3
,
ac3
);
#endif
REGISTER_ENCODER
(
AC3
,
ac3
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录