mickelson/attract
1
0
Fork 0
mirror of https://github.com/mickelson/attract.git synced 2026-10-12 02:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #768 from tkoecker/master

Browse Source 
fix build with newer ffmpeg versions
This commit is contained in:
Andrew Mickelson
2026-01-28 21:12:51 -08:00
committed by GitHub
parent baff659a09 a2c119dc42
commit f892e8b39c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extlibs/gameswf/gameswf/gameswf_render_handler_ogles.cpp
+8 -6
View File
@@ -28,6 +28,7 @@
extern "C"
{
#include <libavcodec/avcodec.h>
#include <libavutil/imgutils.h>
#include <libswscale/swscale.h>
};
@@ -1190,25 +1191,26 @@ void ffmpeg_resample( int bpp, int src_width, int src_height, int src_pitch,
if ( !ctx )
return;
AVPicture my_pict;
avpicture_alloc( &my_pict, fmt, dst_width, dst_height );
uint8_t *data[4];
int linesizes[4];
av_image_alloc(data, linesizes, dst_width, dst_height, fmt, 1);
const uint8_t *src[4] = { src_data, NULL, NULL, NULL };
const int src_stride[4] = { src_pitch, 0, 0, 0 };
sws_scale( ctx, src, src_stride, 0, src_height,
my_pict.data, my_pict.linesize );
data, linesizes );
create_texture( ( bpp == 3 ) ? GL_RGB : GL_RGBA,
dst_width, dst_height, my_pict.data[0], 0 );
dst_width, dst_height, data[0], 0 );
#if GENERATE_MIPMAPS
// Build mipmaps.
image::image_base im(my_pict.data[0], dst_width, dst_height, dst_width*bpp);
image::image_base im(data[0], dst_width, dst_height, dst_width*bpp);
generate_mipmaps(fmt, fmt, bpp, &im);
#endif // GENERATE_MIPMAPS
avpicture_free( &my_pict );
av_freep( &data[0] );
sws_freeContext( ctx );
}