diff --git a/BUILD.gn b/BUILD.gn index ccebf456bc..2f92b58303 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -148,7 +148,6 @@ config("ffmpeg_config") { "-DOHOS_EXPAND_MP4_INFO", "-DOHOS_OPTIMIZE_DELAY", "-DOHOS_AV3A_DEMUXER", - "-DOHOS_FRAME_TYPE_COMPAT", ] if (use_musl) { cflags += [ "-Wno-bool-operation" ] diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c656536a4f..5e35444962 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -3549,8 +3549,8 @@ static int mpegts_resync(AVFormatContext *s, int seekback, const uint8_t *curren if (avio_feof(pb)) return AVERROR_EOF; if (c == 0x47) { -#ifdef OHOS_FRAME_TYPE_COMPAT - avio_seek(pb, -1, SEEK_CUR); +#ifdef OHOS_OPT_COMPAT + avio_seek(pb, -1, SEEK_CUR); #else int new_packet_size, ret; avio_seek(pb, -1, SEEK_CUR); @@ -3565,7 +3565,7 @@ static int mpegts_resync(AVFormatContext *s, int seekback, const uint8_t *curren } avio_seek(pb, pos, SEEK_SET); #endif - return 0; + return 0; } } av_log(s, AV_LOG_ERROR,