projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
33cd32b
)
avcodec: disallow reget_buffer() if pix_fmt changed.
author
Ronald S. Bultje
<rsbultje@gmail.com>
Fri, 17 Feb 2012 22:48:57 +0000
(14:48 -0800)
committer
Ronald S. Bultje
<rsbultje@gmail.com>
Fri, 24 Feb 2012 22:28:15 +0000
(14:28 -0800)
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
67c9e36
..
285be9b
100644
(file)
--- a/
libavcodec/utils.c
+++ b/
libavcodec/utils.c
@@
-553,6
+553,8
@@
int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){
return s->get_buffer(s, pic);
}
+ assert(s->pix_fmt == pic->pix_fmt);
+
/* If internal buffer type return the same buffer */
if(pic->type == FF_BUFFER_TYPE_INTERNAL) {
if(s->pkt) pic->pkt_pts= s->pkt->pts;