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:
22137bb
)
af_ashowinfo: fix plane size computation for planar layout formats
author
Stefano Sabatini
<stefasab@gmail.com>
Sat, 15 Oct 2011 23:49:20 +0000
(
01:49
+0200)
committer
Stefano Sabatini
<stefasab@gmail.com>
Sat, 15 Oct 2011 23:58:31 +0000
(
01:58
+0200)
+10l.
libavfilter/af_ashowinfo.c
patch
|
blob
|
history
diff --git
a/libavfilter/af_ashowinfo.c
b/libavfilter/af_ashowinfo.c
index
c8e4d31
..
0ad7252
100644
(file)
--- a/
libavfilter/af_ashowinfo.c
+++ b/
libavfilter/af_ashowinfo.c
@@
-46,9
+46,10
@@
static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
char chlayout_str[128];
int plane;
int linesize =
- av_get_channel_layout_nb_channels(samplesref->audio->channel_layout) *
samplesref->audio->nb_samples *
av_get_bytes_per_sample(samplesref->format);
+ if (!samplesref->audio->planar) /* packed layout */
+ linesize *= av_get_channel_layout_nb_channels(samplesref->audio->channel_layout);
for (plane = 0; samplesref->data[plane] && plane < 8; plane++) {
uint8_t *data = samplesref->data[plane];