mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Make the ugly hack which uses an unused entry in the internal buffer
array actually use a unused one, so it does work. Originally committed as revision 14286 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
fc7ad2af05
commit
6ebc89ac48
@ -195,7 +195,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
|
|||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if(s->internal_buffer==NULL){
|
if(s->internal_buffer==NULL){
|
||||||
s->internal_buffer= av_mallocz(INTERNAL_BUFFER_SIZE*sizeof(InternalBuffer));
|
s->internal_buffer= av_mallocz((INTERNAL_BUFFER_SIZE+1)*sizeof(InternalBuffer));
|
||||||
}
|
}
|
||||||
#if 0
|
#if 0
|
||||||
s->internal_buffer= av_fast_realloc(
|
s->internal_buffer= av_fast_realloc(
|
||||||
@ -206,7 +206,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
buf= &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count];
|
buf= &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count];
|
||||||
picture_number= &(((InternalBuffer*)s->internal_buffer)[INTERNAL_BUFFER_SIZE-1]).last_pic_num; //FIXME ugly hack
|
picture_number= &(((InternalBuffer*)s->internal_buffer)[INTERNAL_BUFFER_SIZE]).last_pic_num; //FIXME ugly hack
|
||||||
(*picture_number)++;
|
(*picture_number)++;
|
||||||
|
|
||||||
if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){
|
if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){
|
||||||
|
Loading…
Reference in New Issue
Block a user