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:
cdafec6
)
ffplay: fix warning that i just mistakenly introduced
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 20 Jul 2012 01:47:11 +0000
(
03:47
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 20 Jul 2012 01:47:11 +0000
(
03:47
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffplay.c
patch
|
blob
|
history
diff --git
a/ffplay.c
b/ffplay.c
index
778bc5b
..
598ce74
100644
(file)
--- a/
ffplay.c
+++ b/
ffplay.c
@@
-1980,7
+1980,7
@@
static int audio_decode_frame(VideoState *is, double *pts_ptr)
}
if (is->swr_ctx) {
- const uint8_t **in = is->frame->extended_data;
+ const uint8_t **in =
(const uint8_t **)
is->frame->extended_data;
uint8_t *out[] = {is->audio_buf2};
int out_count = sizeof(is->audio_buf2) / is->audio_tgt.channels / av_get_bytes_per_sample(is->audio_tgt.fmt);
if (wanted_nb_samples != is->frame->nb_samples) {