- fix BS_PACKAGE_FFMPEG2_BRANCH handling

make/buildsystem-prerequisites.mk

@@ -167,8 +167,8 @@ ni-sources: $(SOURCE_DIR) \
 	$(SOURCE_DIR)/$(NI_STREAMRIPPER)
 
 checkout-branches:
-ifneq ($(FFMPEG_BRANCH),$(empty))
-	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git checkout $(FFMPEG_BRANCH)
+ifneq ($(BS_PACKAGE_FFMPEG2_BRANCH),$(empty))
+	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git checkout $(BS_PACKAGE_FFMPEG2_BRANCH)
 endif
 ifneq ($(KERNEL_BRANCH),$(empty))
 	$(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git checkout $(KERNEL_BRANCH)

make/target-blobs.mk

@@ -153,7 +153,7 @@ kronos_v2-drivers \
 coolstream-drivers: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
 	$(INSTALL) -d $(TARGET_libdir)
 	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib/. $(TARGET_libdir)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/libcoolstream/$(shell echo -n $(FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/libcoolstream/$(shell echo -n $(BS_PACKAGE_FFMPEG2_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir)
 ifeq ($(BOXMODEL),nevis)
 	ln -sf libnxp.so $(TARGET_libdir)/libconexant.so
 endif