Skip to content

Commit e4a58cf

Browse files
Two minor fixes (#251)
* Fix link error in BitStreamParser.cpp g++ -I"../../../.." -D"_UNICODE" -D"UNICODE" -D"DEBUG" -D"_DEBUG" -MMD -MQ ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParser.o -MP -MF ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParser.o.d -Wno-error=attributes -Wno-error=write-strings -pthread -Werror -std=c++11 -fno-exceptions -fno-rtti -fvisibility=hidden -fPIC -Wno-unused-result -O0 -ggdb -m64 -c ../../../../public/samples/CPPSamples/common/BitStreamParser.cpp -o ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParser.o g++ -I"../../../.." -D"_UNICODE" -D"UNICODE" -D"DEBUG" -D"_DEBUG" -MMD -MQ ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH264.o -MP -MF ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH264.o.d -Wno-error=attributes -Wno-error=write-strings -pthread -Werror -std=c++11 -fno-exceptions -fno-rtti -fvisibility=hidden -fPIC -Wno-unused-result -O0 -ggdb -m64 -c ../../../../public/samples/CPPSamples/common/BitStreamParserH264.cpp -o ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH264.o g++ -I"../../../.." -D"_UNICODE" -D"UNICODE" -D"DEBUG" -D"_DEBUG" -MMD -MQ ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH265.o -MP -MF ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH265.o.d -Wno-error=attributes -Wno-error=write-strings -pthread -Werror -std=c++11 -fno-exceptions -fno-rtti -fvisibility=hidden -fPIC -Wno-unused-result -O0 -ggdb -m64 -c ../../../../public/samples/CPPSamples/common/BitStreamParserH265.cpp -o ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH265.o g++ -Wl,--no-undefined -Wl,-rpath='$ORIGIN' -Wno-error=attributes -Wno-error=write-strings -pthread -Werror -std=c++11 -fno-exceptions -fno-rtti -fvisibility=hidden -fPIC -Wno-unused-result -O0 -ggdb -m64 -o ../../../../bin/dbg_64/SimpleROI ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/SimpleROI/SimpleROI.o ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParser.o ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH264.o ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParserH265.o ../../../../bin/dbg_64/build/SimpleROI/public/common/AMFFactory.o ../../../../bin/dbg_64/build/SimpleROI/public/common/AMFSTL.o ../../../../bin/dbg_64/build/SimpleROI/public/common/DataStreamFactory.o ../../../../bin/dbg_64/build/SimpleROI/public/common/DataStreamFile.o ../../../../bin/dbg_64/build/SimpleROI/public/common/DataStreamMemory.o ../../../../bin/dbg_64/build/SimpleROI/public/common/Thread.o ../../../../bin/dbg_64/build/SimpleROI/public/common/TraceAdapter.o ../../../../bin/dbg_64/build/SimpleROI/public/common/Linux/ThreadLinux.o -ldl -lm -lX11 -lGL /usr/bin/ld: ../../../../bin/dbg_64/build/SimpleROI/public/samples/CPPSamples/common/BitStreamParser.o: in function `BitStreamParser::Create(amf::AMFDataStream*, BitStreamType, amf::AMFContext*)': /home/rgonzalez/src/github.com/GPUOpen-LibrariesAndSDKs/AMF/amf/public/samples/CPPSamples/SimpleROI/../../../../public/samples/CPPSamples/common/BitStreamParser.cpp:111: undefined reference to `CreateIVFParser(amf::AMFDataStream*, amf::AMFContext*)' collect2: error: ld returned 1 exit status make[1]: *** [../../../../public/make/common_rules.mak:84: ../../../../bin/dbg_64/SimpleROI] Error 1 make[1]: Leaving directory '/home/rgonzalez/src/github.com/GPUOpen-LibrariesAndSDKs/AMF/amf/public/samples/CPPSamples/SimpleROI' make: *** [Makefile:51: ../../public/samples/CPPSamples/SimpleROI] Error 2 * Fix expression result unused ``` ../../../../public/src/components/ComponentsFFMPEG/UtilsFFMPEG.cpp:450:41: error: expression result unused [-Werror,-Wunused-value] case AMF_STREAM_CODEC_ID_VP9_10BIT: (AVCodecID)AMF_CODEC_VP9_10BIT; ^ ~~~~~~~~~~~~~~~~~~~ ```
1 parent 2366f74 commit e4a58cf

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

amf/public/samples/CPPSamples/SimpleROI/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pp_include_dirs = $(amf_root)
3434
src_files = \
3535
public/samples/CPPSamples/SimpleROI/SimpleROI.cpp \
3636
$(samples_common_dir)/BitStreamParser.cpp \
37+
$(samples_common_dir)/BitStreamParserIVF.cpp \
3738
$(samples_common_dir)/BitStreamParserH264.cpp \
3839
$(samples_common_dir)/BitStreamParserH265.cpp \
3940
$(public_common_dir)/AMFFactory.cpp \

amf/public/src/components/ComponentsFFMPEG/UtilsFFMPEG.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ AVCodecID AMF_STD_CALL amf::GetFFMPEGVideoFormat(AMF_STREAM_CODEC_ID_ENUM i
447447
case AMF_STREAM_CODEC_ID_H265_HEVC: return AV_CODEC_ID_HEVC;
448448
case AMF_STREAM_CODEC_ID_H265_MAIN10: return (AVCodecID)AMF_CODEC_H265MAIN10;
449449
case AMF_STREAM_CODEC_ID_VP9: return (AVCodecID)AV_CODEC_ID_VP9;
450-
case AMF_STREAM_CODEC_ID_VP9_10BIT: (AVCodecID)AMF_CODEC_VP9_10BIT;
450+
case AMF_STREAM_CODEC_ID_VP9_10BIT: return (AVCodecID)AMF_CODEC_VP9_10BIT;
451451
case AMF_STREAM_CODEC_ID_AV1: return AV_CODEC_ID_AV1;
452452

453453
}

0 commit comments

Comments
 (0)