From 0f962fef46a0a8c33eab189ad852a10ce98dc732 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 22 Oct 2016 12:02:10 +0200 Subject: [PATCH] record, streamts: use modern AV_CODEC_ID enums this allows to build with current ffmpeg Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/5bf115db805842b5ec55374b379d267d4b3fe15a Author: Stefan Seyfried Date: 2016-10-22 (Sat, 22 Oct 2016) --- src/driver/record.cpp | 2 +- src/driver/streamts.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 07887096c..158476132 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -2172,7 +2172,7 @@ void CStreamRec::run() continue; AVCodecContext *codec = ifcx->streams[pkt.stream_index]->codec; - if (bsfc && codec->codec_id == CODEC_ID_H264) { + if (bsfc && codec->codec_id == AV_CODEC_ID_H264) { AVPacket newpkt = pkt; if (av_bitstream_filter_filter(bsfc, codec, NULL, &newpkt.data, &newpkt.size, pkt.data, pkt.size, pkt.flags & AV_PKT_FLAG_KEY) >= 0) { diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index a917d2352..f293f0e7e 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -896,7 +896,7 @@ void CStreamStream::run() continue; AVCodecContext *codec = ifcx->streams[pkt.stream_index]->codec; - if (bsfc && codec->codec_id == CODEC_ID_H264 ) { + if (bsfc && codec->codec_id == AV_CODEC_ID_H264 ) { AVPacket newpkt = pkt; if (av_bitstream_filter_filter(bsfc, codec, NULL, &newpkt.data, &newpkt.size, pkt.data, pkt.size, pkt.flags & AV_PKT_FLAG_KEY) >= 0) {