Mercurial > mxe-octave

annotate src/x264-1-ifdef.patch @ 1257:afabf3a51818

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
author Di Appoggio <diappoggio@gmail.com>
date Mon, 20 Sep 2010 22:04:43 +1000
parents
children 050f5ff03b26
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1257
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
1 diff -Nru x264-snapshot-20100706-2245.orig/x264.c x264-snapshot-20100706-2245/x264.c
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
2 --- x264-snapshot-20100706-2245.orig/x264.c 2010-07-07 09:33:15.555062464 +0200
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
3 +++ x264-snapshot-20100706-2245/x264.c 2010-07-07 09:33:45.155061361 +0200
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
4 @@ -195,7 +195,7 @@
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
5 cli_opt_t opt;
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
6 int ret;
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
7
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
8 -#if PTW32_STATIC_LIB
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
9 +#ifdef PTW32_STATIC_LIB
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
10 pthread_win32_process_attach_np();
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
11 pthread_win32_thread_attach_np();
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
12 #endif
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
13 @@ -214,7 +214,7 @@
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
14
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
15 ret = Encode( &param, &opt );
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
16
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
17 -#if PTW32_STATIC_LIB
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
18 +#ifdef PTW32_STATIC_LIB
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
19 pthread_win32_thread_detach_np();
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
20 pthread_win32_process_detach_np();
afabf3a51818 new packages: faac, faad2, ffmpeg, lame, libvpx, opencore-amr, x264
Di Appoggio <diappoggio@gmail.com>
parents:
diff changeset
21 #endif