diff --git a/BUILD.gn b/BUILD.gn index 7db839599c..82fbe8ced1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1119,8 +1119,7 @@ ohos_source_set("ffmpeg_dynamic") { "//third_party/ffmpeg/libavformat/av1.c", "//third_party/ffmpeg/libavformat/av3adec.c", "//third_party/ffmpeg/libavformat/avc.c", - - # "//third_party/ffmpeg/libavformat/avidec.c", + "//third_party/ffmpeg/libavformat/avidec.c", "//third_party/ffmpeg/libavformat/avio.c", "//third_party/ffmpeg/libavformat/aviobuf.c", "//third_party/ffmpeg/libavformat/avlanguage.c", @@ -1304,8 +1303,8 @@ ohos_source_set("ffmpeg_dynamic") { # "//third_party/ffmpeg/libavformat/mpegenc.c", "//third_party/ffmpeg/libavformat/mpegts.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/mpjpegdec.c", # "//third_party/ffmpeg/libavformat/mpl2dec.c", diff --git a/ohos_config.sh b/ohos_config.sh index 94db981de9..664e5cf6c8 100755 --- a/ohos_config.sh +++ b/ohos_config.sh @@ -50,12 +50,12 @@ FF_CONFIG_OPTIONS=" --disable-bzlib --disable-lzma --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 + --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-parser=h263,h264,mpeg4video,vp8,vp9,mpegvideo --enable-parser=mpegaudio,aac,aac_latm,av3a,amr,opus --enable-decoder=h263,h264,mpeg2video,mpeg4,vp8,vp9 - --enable-decoder=mp3,mp3float,aac,aac_latm,ape,flac,vorbis,opus,amrnb,amrwb + --enable-decoder=mp2,mp3,mp3float,aac,aac_latm,ape,flac,vorbis,opus,amrnb,amrwb --enable-decoder=png,bmp --enable-encoder=aac,aac_latm,opus,flac --enable-encoder=mpeg4,h263 @@ -144,12 +144,12 @@ FF_CONFIG_OPTIONS=" --disable-sdl2 --disable-bzlib --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 + --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-parser=h263,h264,mpeg4video,vp8,vp9,mpegvideo --enable-parser=mpegaudio,aac,aac_latm,av3a,amr,opus --enable-decoder=h263,h264,mpeg2video,mpeg4,vp8,vp9 - --enable-decoder=mp3,mp3float,aac,aac_latm,ape,flac,vorbis,opus,amrnb,amrwb + --enable-decoder=mp2,mp3,mp3float,aac,aac_latm,ape,flac,vorbis,opus,amrnb,amrwb --enable-decoder=png,bmp --enable-encoder=aac,aac_latm,opus,flac --enable-encoder=mpeg4,h263