From eb2c6e68be094d8af8170646a1d2b063875da82c Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Thu, 6 Nov 2014 16:06:19 +0100 Subject: uncomment some channels --- CHANGELOG | 3 +++ ToDo | 6 +++++- contrib/audiorecorder.conf | 13 ++++++++----- convert.c | 1 + 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5bc7d65..0baf1c4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,3 +3,6 @@ - removed mp3 codec, not available, not needed, plugin use only libmp3lame for encoding to .mp3 files (audiorecorder.c, setup.c, setup.h) this fix the false/positiv error "...is not compiled with mp3 support.." + +* audiorecorder-2.0.0_rc6 +- uncomment some channels (audiorecoder.conf), suggested by wolfi.m @ vdrportal.de \ No newline at end of file diff --git a/ToDo b/ToDo index f5e5c3a..3a436a3 100644 --- a/ToDo +++ b/ToDo @@ -7,4 +7,8 @@ - fix deprecated warnings, obsolete in (libav-10, ffmepg-2.?.?) convert to use avcodec_decode_audio4 (convert.c) - convert to use avcodec_encode_audio2 (convert.c) \ No newline at end of file + convert to use avcodec_encode_audio2 (convert.c) + +- ffmpeg version 2.4.1 + error --> [audiorecorder]: could not open codec mp2 (convert.c, init_encoder()) + bei mp2 decoding \ No newline at end of file diff --git a/contrib/audiorecorder.conf b/contrib/audiorecorder.conf index cacfc14..37fe1e7 100644 --- a/contrib/audiorecorder.conf +++ b/contrib/audiorecorder.conf @@ -1,8 +1,11 @@ -#S19.2E-1-1093-28465 /* SWR1 BW;ARD SWR */ -#S19.2E-1-1093-28467 /* SWR2;ARD SWR */ -#S19.2E-1-1093-28468 /* SWR3;ARD SWR */ -#S19.2E-1-1093-28471 /* DASDING;ARD SWR */ -#S19.2E-1-1093-28469 /* SWR4 BW;ARD SWR */ +# uncommet your prefered channel for recording +# + +S19.2E-1-1093-28465 /* SWR1 BW;ARD SWR */ +S19.2E-1-1093-28467 /* SWR2;ARD SWR */ +S19.2E-1-1093-28468 /* SWR3;ARD SWR */ +S19.2E-1-1093-28471 /* DASDING;ARD SWR */ +S19.2E-1-1093-28469 /* SWR4 BW;ARD SWR */ #S19.2E-1-1093-28470 /* SWR4 RP;ARD SWR */ #S19.2E-1-1093-28472 /* SWRinfo;ARD SWR */ #S19.2E-1-1093-28466 /* SWR1 RP;ARD SWR */ diff --git a/convert.c b/convert.c index e0f9a7a..5e37a0c 100644 --- a/convert.c +++ b/convert.c @@ -171,6 +171,7 @@ abuffer *cConvert::reencode_mpa_frame(mpeg_audio_frame *mpa_frame, const AVFrame * frame, int * got_packet_ptr ) */ + AVCodecContext *codec_ctx; AVFrame *frame; AVPacket avpkt; av_init_packet(&avpkt); -- cgit v1.2.3