mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-11 06:10:06 +02:00
57 lines
1.4 KiB
Plaintext
57 lines
1.4 KiB
Plaintext
From c507b88d44b69c8133b77dd04c7af8f486810c0b Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@gmail.com>
|
|
Date: Tue, 12 May 2015 20:57:47 +0200
|
|
Subject: C89 "declaration after statement" fixes.
|
|
|
|
|
|
diff --git a/fmfconv_ff.c b/fmfconv_ff.c
|
|
index 7fabf94..c686c89 100644
|
|
--- a/fmfconv_ff.c
|
|
+++ b/fmfconv_ff.c
|
|
@@ -553,15 +553,17 @@ open_video( AVCodec *codec )
|
|
}
|
|
|
|
#ifdef HAVE_FFMPEG_AVCODEC_OPEN2
|
|
- AVDictionary *options = NULL;
|
|
- if( ffmpeg_libx264 ) {
|
|
- setup_x264_dict( &options );
|
|
- }
|
|
+ {
|
|
+ AVDictionary *options = NULL;
|
|
+ if( ffmpeg_libx264 ) {
|
|
+ setup_x264_dict( &options );
|
|
+ }
|
|
|
|
/* open the codec */
|
|
- ret = avcodec_open2( c, codec, &options );
|
|
+ ret = avcodec_open2( c, codec, &options );
|
|
|
|
- av_dict_free( &options );
|
|
+ av_dict_free( &options );
|
|
+ }
|
|
#else
|
|
ret = avcodec_open( c, codec );
|
|
#endif
|
|
diff --git a/rzxtool.c b/rzxtool.c
|
|
index b9717a0..24f5de4 100644
|
|
--- a/rzxtool.c
|
|
+++ b/rzxtool.c
|
|
@@ -370,13 +370,13 @@ write_rzx( const char *filename, libspectrum_rzx *rzx, int compressed )
|
|
int
|
|
main( int argc, char *argv[] )
|
|
{
|
|
- progname = argv[0];
|
|
GSList *actions = NULL;
|
|
options_t options;
|
|
unsigned char *buffer = NULL; size_t length = 0;
|
|
libspectrum_rzx *rzx;
|
|
int error;
|
|
|
|
+ progname = argv[0];
|
|
error = init_libspectrum(); if( error ) return error;
|
|
|
|
error = get_creator( &creator, "rzxtool" ); if( error ) return error;
|
|
--
|
|
2.2.2
|
|
|