Changeset 724303e
- Timestamp:
- Dec 23, 2018, 3:56:38 AM (6 years ago)
- Branches:
- feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master
- Children:
- 79dc9ad
- Parents:
- 8ad7d71
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/io/source_avcodec.c
r8ad7d71 r724303e 31 31 #endif 32 32 #include <libavutil/opt.h> 33 #include <stdlib.h>34 33 35 34 // determine whether we use libavformat from ffmpeg or from libav … … 121 120 uint_t samplerate, uint_t hop_size) { 122 121 aubio_source_avcodec_t * s = AUBIO_NEW(aubio_source_avcodec_t); 123 AVFormatContext *avFormatCtx = s->avFormatCtx;124 AVCodecContext *avCodecCtx = s->avCodecCtx;125 AVFrame *avFrame = s->avFrame;122 AVFormatContext *avFormatCtx = NULL; 123 AVCodecContext *avCodecCtx = NULL; 124 AVFrame *avFrame = NULL; 126 125 sint_t selected_stream = -1; 127 126 #if FF_API_LAVF_AVCTX … … 474 473 475 474 beach: 476 s->avFormatCtx = avFormatCtx;477 s->avCodecCtx = avCodecCtx;478 s->avFrame = avFrame;479 #if defined(HAVE_AVRESAMPLE) || defined(HAVE_SWRESAMPLE)480 s->avr = avr;481 #endif /* HAVE_AVRESAMPLE || HAVE_SWRESAMPLE */482 s->output = output;483 484 475 av_packet_unref(&avPacket); 485 476 }
Note: See TracChangeset
for help on using the changeset viewer.