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:
91a3ea6
)
ffplay: Fix got_frame type.
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 Dec 2011 23:38:22 +0000
(
00:38
+0100)
committer
Marton Balint
<cus@passwd.hu>
Wed, 14 Dec 2011 20:21:22 +0000
(21:21 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
ffplay.c
patch
|
blob
|
history
diff --git
a/ffplay.c
b/ffplay.c
index
d10ac69
..
64198c0
100644
(file)
--- a/
ffplay.c
+++ b/
ffplay.c
@@
-2043,7
+2043,8
@@
static int audio_decode_frame(VideoState *is, double *pts_ptr)
AVPacket *pkt = &is->audio_pkt;
AVCodecContext *dec= is->audio_st->codec;
int len1, len2, data_size, resampled_data_size;
- int64_t dec_channel_layout, got_frame;
+ int64_t dec_channel_layout;
+ int got_frame;
double pts;
int new_packet = 0;
int flush_complete = 0;