!334 新增mpg容器demuxer

Merge pull request !334 from samuellanca/weekly_20241110
This commit is contained in:
openharmony_ci 2024-11-18 07:15:35 +00:00 committed by Gitee
commit 67e35e6186
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 3 deletions

View File

@ -1304,8 +1304,8 @@ ohos_source_set("ffmpeg_dynamic") {
# "//third_party/ffmpeg/libavformat/mpegenc.c", # "//third_party/ffmpeg/libavformat/mpegenc.c",
"//third_party/ffmpeg/libavformat/mpegts.c", "//third_party/ffmpeg/libavformat/mpegts.c",
"//third_party/ffmpeg/libavformat/mpegtsenc.c", "//third_party/ffmpeg/libavformat/mpegtsenc.c",
"//third_party/ffmpeg/libavformat/mpegvideodec.c",
# "//third_party/ffmpeg/libavformat/mpegvideodec.c",
# "//third_party/ffmpeg/libavformat/mpjpeg.c", # "//third_party/ffmpeg/libavformat/mpjpeg.c",
# "//third_party/ffmpeg/libavformat/mpjpegdec.c", # "//third_party/ffmpeg/libavformat/mpjpegdec.c",
# "//third_party/ffmpeg/libavformat/mpl2dec.c", # "//third_party/ffmpeg/libavformat/mpl2dec.c",

View File

@ -50,7 +50,7 @@ FF_CONFIG_OPTIONS="
--disable-bzlib --disable-bzlib
--disable-lzma --disable-lzma
--disable-vulkan --disable-vulkan
--enable-demuxer=mp3,aac,ape,flac,ogg,wav,mov,mpegts,amr,amrnb,amrwb,matroska,flv,mpegps,asf,asf_o,srt,h264,webvtt,av3a,avi --enable-demuxer=mp3,aac,ape,flac,ogg,wav,mov,mpegts,amr,amrnb,amrwb,matroska,flv,mpegps,asf,asf_o,srt,h264,webvtt,av3a,avi,mpegvideo
--enable-muxer=mp4,h264,ipod,amr,mpegts,mp3,wav,flac,av3a --enable-muxer=mp4,h264,ipod,amr,mpegts,mp3,wav,flac,av3a
--enable-parser=h263,h264,mpeg4video,vp8,vp9,mpegvideo --enable-parser=h263,h264,mpeg4video,vp8,vp9,mpegvideo
--enable-parser=mpegaudio,aac,aac_latm,av3a,amr,opus --enable-parser=mpegaudio,aac,aac_latm,av3a,amr,opus
@ -144,7 +144,7 @@ FF_CONFIG_OPTIONS="
--disable-sdl2 --disable-sdl2
--disable-bzlib --disable-bzlib
--disable-lzma --disable-lzma
--enable-demuxer=mp3,aac,ape,flac,ogg,wav,mov,mpegts,amr,amrnb,amrwb,matroska,flv,mpegps,asf,asf_o,srt,h264,webvtt,av3a,avi --enable-demuxer=mp3,aac,ape,flac,ogg,wav,mov,mpegts,amr,amrnb,amrwb,matroska,flv,mpegps,asf,asf_o,srt,h264,webvtt,av3a,avi,mpegvideo
--enable-muxer=mp4,h264,ipod,amr,mpegts,mp3,wav,flac,av3a --enable-muxer=mp4,h264,ipod,amr,mpegts,mp3,wav,flac,av3a
--enable-parser=h263,h264,mpeg4video,vp8,vp9,mpegvideo --enable-parser=h263,h264,mpeg4video,vp8,vp9,mpegvideo
--enable-parser=mpegaudio,aac,aac_latm,av3a,amr,opus --enable-parser=mpegaudio,aac,aac_latm,av3a,amr,opus