[FFmpeg-cvslog] Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'

James Almer git at videolan.org
Fri Mar 31 21:47:46 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 15:46:13 2017 -0300| [ebe9808aaad6d2ac06851964bc86be4f13a6a1be] | committer: James Almer

Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'

* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebe9808aaad6d2ac06851964bc86be4f13a6a1be
---

 doc/examples/decode_audio.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c
index d9ee7e7..a24e0d0 100644
--- a/doc/examples/decode_audio.c
+++ b/doc/examples/decode_audio.c
@@ -31,9 +31,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libavcodec/avcodec.h>
+#include "libavutil/frame.h"
+#include "libavutil/mem.h"
 
-#include <libavutil/frame.h>
+#include "libavcodec/avcodec.h"
 
 #define AUDIO_INBUF_SIZE 20480
 #define AUDIO_REFILL_THRESH 4096


======================================================================




More information about the ffmpeg-cvslog mailing list