From 6abba22cdc2e32e7b2c3de0ce3af3faae28ad6bd 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 ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5f33ee96fd5b5ee5eafa0415752a948907ea1f6f Author: Stefan Seyfried Date: 2016-10-22 (Sat, 22 Oct 2016) ------------------ This commit was generated by Migit --- 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 fc3eb7f07..255a62859 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -2171,7 +2171,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 9edff63c8..aebb0e168 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -899,7 +899,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) {