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:
289737c
)
av_frame_get_buffer: Do not fail when the channel layout is unknown
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 13 Jul 2013 18:58:18 +0000
(20:58 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 13 Jul 2013 19:09:20 +0000
(21:09 +0200)
Fixes handling of cases with unknown layouts but known channel counts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c
patch
|
blob
|
history
diff --git
a/libavutil/frame.c
b/libavutil/frame.c
index
7584ae3
..
3141dec
100644
(file)
--- a/
libavutil/frame.c
+++ b/
libavutil/frame.c
@@
-223,7
+223,7
@@
int av_frame_get_buffer(AVFrame *frame, int align)
if (frame->width > 0 && frame->height > 0)
return get_video_buffer(frame, align);
- else if (frame->nb_samples > 0 &&
frame->channel_layout
)
+ else if (frame->nb_samples > 0 &&
(frame->channel_layout || frame->channels > 0)
)
return get_audio_buffer(frame, align);
return AVERROR(EINVAL);