git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
libopencore-amrwb: Make AMR-WB ifdeffery more precise
[ffmpeg.git]
/
libavformat
/
audiointerleave.c
diff --git
a/libavformat/audiointerleave.c
b/libavformat/audiointerleave.c
index
e4cb1b8
..
5df0bb0
100644
(file)
--- a/
libavformat/audiointerleave.c
+++ b/
libavformat/audiointerleave.c
@@
-21,6
+21,7
@@
*/
#include "libavutil/fifo.h"
+#include "libavutil/mathematics.h"
#include "avformat.h"
#include "audiointerleave.h"
#include "internal.h"
@@
-129,5
+130,5
@@
int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt
}
}
- return get_packet(s, out,
pkt
, flush);
+ return get_packet(s, out,
NULL
, flush);
}