Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
d6e7881c
Commit
d6e7881c
authored
Jul 09, 2014
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.
parent
e4dfc3f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
Makefile
libavcodec/Makefile
+1
-0
msmpeg4.h
libavcodec/msmpeg4.h
+1
-0
No files found.
libavcodec/Makefile
View file @
d6e7881c
...
@@ -508,6 +508,7 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \
...
@@ -508,6 +508,7 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \
celp_filters.o
\
celp_filters.o
\
acelp_vectors.o
acelp_filters.o
acelp_vectors.o
acelp_filters.o
OBJS-$(CONFIG_WMV1_DECODER)
+=
msmpeg4dec.o
msmpeg4.o
msmpeg4data.o
OBJS-$(CONFIG_WMV1_DECODER)
+=
msmpeg4dec.o
msmpeg4.o
msmpeg4data.o
OBJS-$(CONFIG_WMV1_ENCODER)
+=
msmpeg4enc.o
OBJS-$(CONFIG_WMV2_DECODER)
+=
wmv2dec.o
wmv2.o
wmv2dsp.o
\
OBJS-$(CONFIG_WMV2_DECODER)
+=
wmv2dec.o
wmv2.o
wmv2dsp.o
\
msmpeg4dec.o
msmpeg4.o
msmpeg4data.o
msmpeg4dec.o
msmpeg4.o
msmpeg4data.o
OBJS-$(CONFIG_WMV2_ENCODER)
+=
wmv2enc.o
wmv2.o
wmv2dsp.o
\
OBJS-$(CONFIG_WMV2_ENCODER)
+=
wmv2enc.o
wmv2.o
wmv2dsp.o
\
...
...
libavcodec/msmpeg4.h
View file @
d6e7881c
...
@@ -64,6 +64,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
...
@@ -64,6 +64,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
CONFIG_VC1_DECODER)
CONFIG_VC1_DECODER)
#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \
#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \
CONFIG_MSMPEG4V3_ENCODER || \
CONFIG_MSMPEG4V3_ENCODER || \
CONFIG_WMV1_ENCODER || \
CONFIG_WMV2_ENCODER)
CONFIG_WMV2_ENCODER)
#endif
/* AVCODEC_MSMPEG4_H */
#endif
/* AVCODEC_MSMPEG4_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment