aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2011-09-27 10:21:39 -0700
committerAlex Converse <alex.converse@gmail.com>2011-09-27 14:10:12 -0700
commitfe332cf5b9b91f24f3f2bf049b2ed43ccd78149f (patch)
tree4a385d5ba4831196af1d6378640d8d6e919382a6
parentaf3c06b4dbe3bdc801d3fdc3392e7f47b414c17c (diff)
downloadffmpeg-fe332cf5b9b91f24f3f2bf049b2ed43ccd78149f.tar.gz
avconv: Make samples void*.
Different sample formats are different sizes.
-rw-r--r--avconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/avconv.c b/avconv.c
index ad5547f874..a9cd9bf481 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"