From f8220aae3365cd7599a1cce995971b5cca6431ab Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 21 Oct 2015 11:52:38 +0200 Subject: [PATCH] record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/bab181ab5b794d3546bcf293d88d6e63fefdff07 Author: vanhofen Date: 2015-10-21 (Wed, 21 Oct 2015) Origin message was: ------------------ - record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk) --- src/driver/record.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index c91f67a7c..a9f42398a 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1905,16 +1905,16 @@ void CStreamRec::FillMovieInfo(CZapitChannel * channel, APIDList & apid_list) desc += title->value; } switch(codec->codec_id) { - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: audio_pids.atype = 1; break; - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: audio_pids.atype = 5; break; - case CODEC_ID_EAC3: + case AV_CODEC_ID_EAC3: audio_pids.atype = 7; break; - case CODEC_ID_MP2: + case AV_CODEC_ID_MP2: default: audio_pids.atype = 0; break; @@ -1928,7 +1928,7 @@ void CStreamRec::FillMovieInfo(CZapitChannel * channel, APIDList & apid_list) } else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) { recMovieInfo->epgVideoPid = st->id; - if (codec->codec_id == CODEC_ID_H264) + if (codec->codec_id == AV_CODEC_ID_H264) recMovieInfo->VideoType = 1; printf("%s: [VIDEO] 0x%x \n", __FUNCTION__, recMovieInfo->epgVideoPid); }