Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-05 16:25:23 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-12-05 16:34:45 +0400
commit99efd596267248ba5eae1b0e540d880368a402c3 (patch)
tree1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /libavutil/fifo.c
parent1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff)
parentcb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff)
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/fifo.c')
-rw-r--r--libavutil/fifo.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 47328c4585..bafa9e9f98 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -149,8 +149,6 @@ void av_fifo_drain(AVFifoBuffer *f, int size)
#ifdef TEST
-#undef printf
-
int main(void)
{
/* create a FIFO buffer */