[FFmpeg-cvslog] avconv: Make samples void*.

Alex Converse git at videolan.org
Thu Sep 29 01:19:10 CEST 2011


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Sep 27 10:21:39 2011 -0700| [fe332cf5b9b91f24f3f2bf049b2ed43ccd78149f] | committer: Alex Converse

avconv: Make samples void*.

Different sample formats are different sizes.

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

 avconv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/avconv.c b/avconv.c
index ad5547f..a9cd9bf 100644
--- a/avconv.c
+++ b/avconv.c
@@ -136,7 +136,7 @@ static uint8_t *audio_buf;
 static uint8_t *audio_out;
 static unsigned int allocated_audio_out_size, allocated_audio_buf_size;
 
-static short *samples;
+static void *samples;
 
 #define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass"
 



More information about the ffmpeg-cvslog mailing list