OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79c85be
)
10l: audio_buf is already a uint8_t* so no need to cast it
author
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 10 Jun 2010 19:50:14 +0000
(19:50 +0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 10 Jun 2010 19:50:14 +0000
(19:50 +0000)
Originally committed as revision 23571 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
9828628
..
96f1780
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-1840,7
+1840,7
@@
static int output_packet(AVInputStream *ist, int ist_index,
int frame_bytes = enc->frame_size*osize*enc->channels;
if (allocated_audio_buf_size < frame_bytes)
av_exit(1);
- memset(
(uint8_t*)
audio_buf+fifo_bytes, 0, frame_bytes - fifo_bytes);
+ memset(audio_buf+fifo_bytes, 0, frame_bytes - fifo_bytes);
}
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, (short *)audio_buf);