diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 14:22:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 14:24:58 +0200 |
| commit | d197bd4f5ee752c95ebaf7d94257ca5121309674 (patch) | |
| tree | 4944469aac7a57aa67e732ab1aa05f4a4eb81884 /libavformat | |
| parent | 3b0bb321a50cd2591c6bd46059a66f6a53d9fc08 (diff) | |
| parent | 930c9d4373e0f3cb7c64fcfc129127a309f6d066 (diff) | |
| download | ffmpeg-streaming-d197bd4f5ee752c95ebaf7d94257ca5121309674.zip ffmpeg-streaming-d197bd4f5ee752c95ebaf7d94257ca5121309674.tar.gz | |
Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'
* commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066':
avutil: Duplicate ff_log2_tab instead of sharing it across libs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/log2_tab.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index bddd7e1..8a0e129 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -13,6 +13,7 @@ OBJS = allformats.o \ cutils.o \ id3v1.o \ id3v2.o \ + log2_tab.o \ metadata.o \ mux.o \ options.o \ diff --git a/libavformat/log2_tab.c b/libavformat/log2_tab.c new file mode 100644 index 0000000..47a1df0 --- /dev/null +++ b/libavformat/log2_tab.c @@ -0,0 +1 @@ +#include "libavutil/log2_tab.c" |
