Changeset 189c6ae for src/io/source_avcodec.c
- Timestamp:
- Aug 7, 2018, 2:05:49 PM (6 years ago)
- Branches:
- feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master
- Children:
- 1f112cc
- Parents:
- 4624a568 (diff), fb4ab89 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/io/source_avcodec.c
r4624a568 r189c6ae 59 59 #include "source_avcodec.h" 60 60 61 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) 61 62 #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE 63 #else 64 #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE 65 #endif 62 66 63 67 struct _aubio_source_avcodec_t { … … 271 275 // default to mono output 272 276 aubio_source_avcodec_reset_resampler(s, 0); 277 278 if (s->avr == NULL) goto beach; 273 279 274 280 s->eof = 0; … … 419 425 goto beach; 420 426 } 427 428 #if LIBAVUTIL_VERSION_MAJOR > 52 429 if (avFrame->channels != (sint_t)s->input_channels) { 430 AUBIO_WRN ("source_avcodec: trying to read from %d channel(s)," 431 "but configured for %d; is '%s' corrupt?\n", avFrame->channels, 432 s->input_channels, s->path); 433 goto beach; 434 } 435 #endif 421 436 422 437 #ifdef HAVE_AVRESAMPLE
Note: See TracChangeset
for help on using the changeset viewer.