Skip to content

fix build with newer ffmpeg versions #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tkoecker wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −6
Open

fix build with newer ffmpeg versions #768

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions extlibs/gameswf/gameswf/gameswf_render_handler_ogles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
extern "C"
{
#include <libavcodec/avcodec.h>
#include <libavutil/imgutils.h>
#include <libswscale/swscale.h>
};

Expand Down Expand Up @@ -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 );
}

Expand Down