projects
/
aubio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7e5b1bc
de9178e
)
Merge branch 'feature/wrapavcodec'
author
Paul Brossier
<piem@piem.org>
Mon, 29 Oct 2018 22:47:29 +0000
(23:47 +0100)
committer
Paul Brossier
<piem@piem.org>
Mon, 29 Oct 2018 22:47:29 +0000
(23:47 +0100)
1
2
src/io/source_avcodec.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/io/source_avcodec.c
index
2803990
,
ebb9ba5
..
f0be674
---
1
/
src/io/source_avcodec.c
---
2
/
src/io/source_avcodec.c
+++ b/
src/io/source_avcodec.c
@@@
-430,12
-448,10
+448,12
@@@
void aubio_source_avcodec_readframe(aub
#if LIBAVUTIL_VERSION_MAJOR > 52
if (avFrame->channels != (sint_t)s->input_channels) {
AUBIO_WRN ("source_avcodec: trying to read from %d channel(s),"
- "but configured for %d; is '%s' corrupt?\n",
avFrame->channels,
- s->input_channels, s->path);
+ "but configured for %d; is '%s' corrupt?\n",
+
avFrame->channels,
s->input_channels, s->path);
goto beach;
}
+#else
+#warning "avutil < 53 is deprecated, crashes might occur on corrupt files"
#endif
#ifdef HAVE_AVRESAMPLE