mirror of https://git.ffmpeg.org/ffmpeg.git
os2.diff by (Paul Smedley // paul smedley info)
Originally committed as revision 4160 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
66b32bf272
commit
3ca4b65479
|
@ -315,12 +315,12 @@ make="gmake"
|
|||
;;
|
||||
OS/2)
|
||||
TMPE=$TMPE".exe"
|
||||
ar="emxomfar -p64"
|
||||
ar="emxomfar -p128"
|
||||
ranlib="echo ignoring ranlib"
|
||||
strip="echo ignoring strip"
|
||||
CFLAGS="-Zomf"
|
||||
LDFLAGS="-Zomf -Zstack 16384 -s"
|
||||
SHFLAGS=""
|
||||
SHFLAGS="-Zdll -Zomf"
|
||||
FFSLDFLAGS=""
|
||||
LIBPREF=""
|
||||
LIBSUF=".lib"
|
||||
|
@ -333,7 +333,9 @@ audio_oss="no"
|
|||
dv1394="no"
|
||||
network="no"
|
||||
ffserver="no"
|
||||
vhook="no"
|
||||
os2="yes"
|
||||
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
|
|
25
ffplay.c
25
ffplay.c
|
@ -28,6 +28,23 @@
|
|||
#undef main /* We don't want SDL to override our main() */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_OS2
|
||||
#define INCL_DOS
|
||||
#include <os2.h>
|
||||
#include <stdio.h>
|
||||
|
||||
void MorphToPM()
|
||||
{
|
||||
PPIB pib;
|
||||
PTIB tib;
|
||||
|
||||
DosGetInfoBlocks(&tib, &pib);
|
||||
|
||||
// Change flag from VIO to PM:
|
||||
if (pib->pib_ultype==2) pib->pib_ultype = 3;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(__linux__)
|
||||
#define HAVE_X11
|
||||
#endif
|
||||
|
@ -1887,6 +1904,14 @@ int main(int argc, char **argv)
|
|||
/* register all codecs, demux and protocols */
|
||||
av_register_all();
|
||||
|
||||
#ifdef CONFIG_OS2
|
||||
MorphToPM(); // Morph the VIO application to a PM one to be able to use Win* functions
|
||||
|
||||
// Make stdout and stderr unbuffered
|
||||
setbuf( stdout, NULL );
|
||||
setbuf( stderr, NULL );
|
||||
#endif
|
||||
|
||||
parse_options(argc, argv, options);
|
||||
|
||||
if (!input_filename)
|
||||
|
|
Loading…
Reference in New Issue