API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 6th, 2008
341
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 101.67 KB | None | 0 0
raw download clone embed print report
  1. diff -aur MPlayer-0.90rc2.orig/cfg-common.h MPlayer-0.90rc2/cfg-common.h
  2. --- MPlayer-0.90rc2.orig/cfg-common.h 2002-12-23 08:33:05.000000000 +0800
  3. +++ MPlayer-0.90rc2/cfg-common.h 2008-09-06 21:57:20.000000000 +0800
  4. @@ -10,7 +10,7 @@
  5. #endif
  6. #ifdef HAVE_VCD
  7. {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
  8. - {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
  9. +// {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
  10. #else
  11. {"vcd", "VCD support is NOT available on this system!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
  12. #endif
  13. @@ -93,7 +93,6 @@
  14. #else
  15. {"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
  16. #endif
  17. - {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
  18.  
  19. // ------------------------- a-v sync options --------------------
  20.  
  21. @@ -287,31 +286,6 @@
  22. {NULL, NULL, 0, 0, 0, 0, NULL}
  23. };
  24.  
  25. -/* VIVO demuxer options: */
  26. -extern int vivo_param_version;
  27. -extern char *vivo_param_acodec;
  28. -extern int vivo_param_abitrate;
  29. -extern int vivo_param_samplerate;
  30. -extern int vivo_param_bytesperblock;
  31. -extern int vivo_param_width;
  32. -extern int vivo_param_height;
  33. -extern int vivo_param_vformat;
  34. -extern char *dvd_device, *cdrom_device;
  35. -
  36. -struct config vivoopts_conf[]={
  37. - {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL},
  38. - /* audio options */
  39. - {"acodec", &vivo_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
  40. - {"abitrate", &vivo_param_abitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
  41. - {"samplerate", &vivo_param_samplerate, CONF_TYPE_INT, 0, 0, 0, NULL},
  42. - {"bytesperblock", &vivo_param_bytesperblock, CONF_TYPE_INT, 0, 0, 0, NULL},
  43. - /* video options */
  44. - {"width", &vivo_param_width, CONF_TYPE_INT, 0, 0, 0, NULL},
  45. - {"height", &vivo_param_height, CONF_TYPE_INT, 0, 0, 0, NULL},
  46. - {"vformat", &vivo_param_vformat, CONF_TYPE_INT, 0, 0, 0, NULL},
  47. - {NULL, NULL, 0, 0, 0, 0, NULL}
  48. -};
  49. -
  50. extern int mf_support;
  51. extern int mf_w;
  52. extern int mf_h;
  53. diff -aur MPlayer-0.90rc2.orig/codec-cfg.c MPlayer-0.90rc2/codec-cfg.c
  54. --- MPlayer-0.90rc2.orig/codec-cfg.c 2002-12-16 10:22:37.000000000 +0800
  55. +++ MPlayer-0.90rc2/codec-cfg.c 2008-09-06 21:57:20.000000000 +0800
  56. @@ -233,7 +233,6 @@
  57. {
  58. static char *audiodrv[] = {
  59. "null",
  60. - "mp3lib",
  61. "pcm",
  62. "libac3",
  63. "acm",
  64. diff -aur MPlayer-0.90rc2.orig/configure MPlayer-0.90rc2/configure
  65. --- MPlayer-0.90rc2.orig/configure 2002-12-23 08:33:05.000000000 +0800
  66. +++ MPlayer-0.90rc2/configure 2008-09-06 21:57:20.000000000 +0800
  67. @@ -1677,22 +1677,6 @@
  68. echores "$_nanosleep"
  69.  
  70.  
  71. -echocheck "socklib"
  72. -# for Solaris (socket stuff is in -lsocket, gethostbyname and friends in -lnsl):
  73. -cat > $TMPC << EOF
  74. -#include <netdb.h>
  75. -int main(void) { (void) gethostbyname(0); return 0; }
  76. -EOF
  77. -cc_check -lsocket && _ld_sock="-lsocket"
  78. -cc_check -lnsl && _ld_sock="-lnsl"
  79. -cc_check -lsocket -lnsl && _ld_sock="-lsocket -lnsl"
  80. -if test "$_ld_sock" ; then
  81. - echores "yes (using $_ld_sock)"
  82. -else
  83. - echores "no"
  84. -fi
  85. -
  86. -
  87. _use_aton=no
  88. echocheck "inet_pton()"
  89. cat > $TMPC << EOF
  90. @@ -1895,35 +1879,6 @@
  91. #echores "using $_ld_dl_dynamic"
  92.  
  93.  
  94. -echocheck "pthread"
  95. -cat > $TMPC << EOF
  96. -#include <pthread.h>
  97. -void* func(void *arg) { return arg; }
  98. -int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
  99. -EOF
  100. -if ( cc_check && $TMPO ) ; then # QNX
  101. - _ld_pthread=''
  102. -elif ( cc_check -lpthread && $TMPO ) ; then
  103. - _ld_pthread='-lpthread'
  104. -elif ( cc_check -pthread && $TMPO ) ; then
  105. - _ld_pthread='-pthread'
  106. -else
  107. - if test "$_ld_static" ; then
  108. - # for crosscompilation, we cannot execute the program, be happy if we can link statically
  109. - if ( cc_check -lpthread ) ; then
  110. - _ld_pthread='-lpthread'
  111. - elif ( cc_check -pthread ) ; then
  112. - _ld_pthread='-pthread'
  113. - else
  114. - die "Static lib pthread not found (needed by Windows and networking stufff)."
  115. - fi
  116. - else
  117. - die "Lib pthread not found (needed by Windows and networking stuff)."
  118. - fi
  119. -fi
  120. -echores "yes (using $_ld_pthread)"
  121. -
  122. -
  123. echocheck "sys/soundcard.h"
  124. cat > $TMPC << EOF
  125. #include <sys/soundcard.h>
  126. @@ -3389,7 +3344,7 @@
  127. _dvdread=no
  128. if test "$_dl" = yes; then
  129. cc_check \
  130. - -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -ldvdread $_ld_dl && \
  131. + -ldvdread $_ld_dl && \
  132. _dvdread=yes
  133. fi
  134. fi
  135. @@ -3541,7 +3496,7 @@
  136. int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; }
  137. EOF
  138. _zlib=no
  139. -cc_check -lz && _zlib=yes
  140. +cc_check -lz && _zlib=no
  141. if test "$_zlib" = yes ; then
  142. _def_zlib='#define HAVE_ZLIB 1'
  143. _ld_zlib='-lz'
  144. @@ -4540,14 +4495,6 @@
  145. # FIXME bsd needs this so maybe other OS'es
  146. CFLAGS="$CFLAGS -D_THREAD_SAFE"
  147. fi
  148. -# 64 bit file offsets?
  149. -if test "$_largefiles" = yes || freebsd ; then
  150. - CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  151. - if test "$_dvdread" = yes ; then
  152. - # dvdread support requires this (for off64_t)
  153. - CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
  154. - fi
  155. -fi
  156.  
  157. echocheck "ftello()"
  158. # if we dont have ftello map it to ftell
  159. @@ -4983,12 +4930,12 @@
  160. /* Use libavcodec's decoders */
  161. #define CONFIG_DECODERS 1
  162. /* Use libavcodec's encoders */
  163. -#define CONFIG_ENCODERS 1
  164. +//#define CONFIG_ENCODERS 1
  165.  
  166. /* Use codec libs included in mplayer CVS / source dist: */
  167. -#define USE_MP3LIB
  168. +//#define USE_MP3LIB
  169. #define USE_LIBA52
  170. -#define USE_LIBMPEG2
  171. +//#define USE_LIBMPEG2
  172.  
  173. /* Use the SVQ1 decoder in libmpcodecs - we don't want/need it with libavcodec */
  174. #ifndef USE_LIBAVCODEC
  175. @@ -5181,7 +5128,7 @@
  176.  
  177. /* libmpeg2 uses a different feature test macro for mediaLib */
  178. #ifdef HAVE_MLIB
  179. -#define LIBMPEG2_MLIB 1
  180. +//#define LIBMPEG2_MLIB 1
  181. #endif
  182.  
  183. /* libvo options */
  184. diff -aur MPlayer-0.90rc2.orig/cpudetect.c MPlayer-0.90rc2/cpudetect.c
  185. --- MPlayer-0.90rc2.orig/cpudetect.c 2002-12-23 09:24:42.000000000 +0800
  186. +++ MPlayer-0.90rc2/cpudetect.c 2008-09-06 21:57:20.000000000 +0800
  187. @@ -165,31 +165,6 @@
  188. // caps->has3DNow=1;
  189. // caps->hasMMX2 = 0;
  190. // caps->hasMMX = 0;
  191. -
  192. -#ifndef HAVE_MMX
  193. - if(caps->hasMMX) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"MMX supported but disabled\n");
  194. - caps->hasMMX=0;
  195. -#endif
  196. -#ifndef HAVE_MMX2
  197. - if(caps->hasMMX2) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"MMX2 supported but disabled\n");
  198. - caps->hasMMX2=0;
  199. -#endif
  200. -#ifndef HAVE_SSE
  201. - if(caps->hasSSE) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"SSE supported but disabled\n");
  202. - caps->hasSSE=0;
  203. -#endif
  204. -#ifndef HAVE_SSE2
  205. - if(caps->hasSSE2) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"SSE2 supported but disabled\n");
  206. - caps->hasSSE2=0;
  207. -#endif
  208. -#ifndef HAVE_3DNOW
  209. - if(caps->has3DNow) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNow supported but disabled\n");
  210. - caps->has3DNow=0;
  211. -#endif
  212. -#ifndef HAVE_3DNOWEX
  213. - if(caps->has3DNowExt) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNowExt supported but disabled\n");
  214. - caps->has3DNowExt=0;
  215. -#endif
  216. }
  217.  
  218.  
  219. diff -aur MPlayer-0.90rc2.orig/etc/codecs.conf MPlayer-0.90rc2/etc/codecs.conf
  220. --- MPlayer-0.90rc2.orig/etc/codecs.conf 2002-12-23 04:16:52.000000000 +0800
  221. +++ MPlayer-0.90rc2/etc/codecs.conf 2008-09-06 21:57:20.000000000 +0800
  222. @@ -10,26 +10,6 @@
  223. ;=============================================================================
  224.  
  225. ; mpeg 1/2 decoding:
  226. -; Note: mpegpes is preferred for hw decoders:
  227. -
  228. -videocodec mpegpes
  229. - info "Mpeg PES output (.mpg or Dxr3/DVB card)"
  230. - comment "for hardware decoding"
  231. - status working
  232. - format 0x10000001 ; mpeg 1
  233. - format 0x10000002 ; mpeg 2
  234. - driver mpegpes
  235. - out MPES
  236. -
  237. -videocodec mpeg12
  238. - info "MPEG 1 or 2 (libmpeg2)"
  239. - comment "with postprocessing"
  240. - status working
  241. - format 0x10000001 ; mpeg 1
  242. - format 0x10000002 ; mpeg 2
  243. - driver libmpeg2
  244. -; dll "libmpeg2"
  245. - out YV12,I420,IYUV
  246.  
  247. videocodec ffmpeg12
  248. info "FFmpeg MPEG 1/2"
  249. @@ -42,211 +22,9 @@
  250. dll "mpegvideo"
  251. out YV12,I420,IYUV
  252.  
  253. -; we have only native opensource codecs for these:
  254. -
  255. -videocodec nuv
  256. - info "NuppelVideo"
  257. - status working
  258. - fourcc NUV1
  259. - driver nuv
  260. - out I420,IYUV
  261. -
  262. -videocodec mpng
  263. - info "PNG images decoder"
  264. - status working
  265. - comment "Gray scaled PNG with Alpha channel not supported"
  266. - fourcc mpng,MPNG
  267. - dll "libpng"
  268. - driver mpng
  269. - out BGR32,BGR24
  270. -
  271. -videocodec mtga
  272. - info "TGA images decoder"
  273. - status working
  274. - comment "Only 24bpp and 32bpp RGB TGA files supported"
  275. - fourcc mtga,MTGA
  276. - driver mtga
  277. - out BGR32,BGR24
  278. -
  279. -videocodec fli
  280. - info "Autodesk FLI/FLC Animation"
  281. - status working
  282. - comment "FLIC is an internal MPlayer FOURCC"
  283. - fourcc FLIC
  284. - driver fli
  285. - out BGR32,BGR24
  286. -
  287. -videocodec qtrle
  288. - info "Quicktime Animation (RLE)"
  289. - status working
  290. - format 0x20656C72 ; "rle "
  291. - driver qtrle
  292. - out BGR32,BGR24,BGR15 query
  293. -
  294. -videocodec qtrpza
  295. - info "Quicktime Apple Video"
  296. - status working
  297. - fourcc rpza,azpr
  298. - driver qtrpza
  299. - out BGR32,BGR24,BGR15
  300. -
  301. -videocodec qtsmc
  302. - info "Apple Graphics (SMC) codec"
  303. - status working
  304. - format 0x20636d73 ; "smc "
  305. - driver qtsmc
  306. - out BGR32,BGR24
  307. -
  308. -videocodec cyuv
  309. - info "Creative YUV (native codec)"
  310. - status working
  311. - fourcc cyuv,CYUV
  312. - driver cyuv
  313. - out 411P
  314. - out YUY2,UYVY
  315. - out 422P
  316. -
  317. -videocodec msrle
  318. - info "Microsoft RLE"
  319. - status working
  320. - format 0x1
  321. - format 0x2
  322. - driver msrle
  323. - out BGR32,BGR24,BGR16,BGR15
  324. -
  325. -videocodec roqvideo
  326. - info "Id RoQ File Video Decoder"
  327. - status buggy
  328. - comment "buggy"
  329. - fourcc RoQV ; RoQV is an internal MPlayer FOURCC
  330. - driver roqvideo
  331. - out YV12
  332. -
  333. -videocodec lzo
  334. - info "LZO compressed"
  335. - status working
  336. - fourcc LZO1
  337. - driver lzo
  338. - dll "liblzo"
  339. - out YV12,I420
  340. - out BGR24 flip
  341. -
  342. -; prefer native codecs over win32?
  343. -; the win32 codecs probably are (better) optimized and support direct
  344. -; rendering, so this may be not the best idea...
  345. -
  346. -;WIN32:
  347. -
  348. -videocodec cram
  349. - info "Microsoft Video 1"
  350. - comment "-vop palette required for 8bpp"
  351. - status buggy
  352. - fourcc cram,CRAM CRAM
  353. - fourcc msvc,MSVC CRAM
  354. - fourcc wham,WHAM CRAM
  355. - driver vfw
  356. - dll "msvidc32.dll"
  357. - out BGR24,BGR15,BGR8 static,query
  358. -
  359. -videocodec cvidvfw
  360. - info "Cinepak Video"
  361. - status working
  362. - fourcc cvid
  363. - driver vfw
  364. - dll "iccvid.dll"
  365. -; out YUY2
  366. -; out UYVY
  367. - out BGR24,BGR15 static
  368. -
  369. -videocodec huffyuv
  370. - info "HuffYUV"
  371. - status buggy
  372. - fourcc HFYU
  373. - driver vfw
  374. - dll "huffyuv.dll"
  375. - out YUY2 flip,noflip,query
  376. -; out UYVY flip
  377. - out BGR32,BGR24 flip,query
  378. -
  379. -;NATIVE:
  380. -
  381. -videocodec svq1
  382. - info "Sorenson v1 (native codec)"
  383. - status buggy
  384. - fourcc SVQ1
  385. - driver svq1
  386. - out YVU9
  387. -
  388. -videocodec video1
  389. - info "Microsoft Video 1 (native codec)"
  390. - status working
  391. - fourcc cram,CRAM
  392. - fourcc msvc,MSVC
  393. - fourcc wham,WHAM
  394. - driver msvidc
  395. - out BGR32,BGR24
  396. -
  397. -videocodec cvid
  398. - info "Cinepak Video (native codec)"
  399. - status working
  400. - fourcc cvid,CVID
  401. - driver cinepak
  402. - out YV12,I420,IYUV
  403. - out YUY2
  404. - out BGR32,BGR24
  405. -
  406. -videocodec mphuffyuv
  407. - info "HuffYUV (native codec)"
  408. - status working
  409. - fourcc HFYU
  410. - driver huffyuv
  411. - out YUY2
  412. - out BGR32,BGR24
  413. -
  414. -videocodec mpmszh
  415. - info "AVImszh (native codec)"
  416. - status working
  417. - fourcc MSZH
  418. - driver lcl
  419. - out BGR24
  420. -
  421. -videocodec mpzlib
  422. - info "AVIzlib (native codec)"
  423. - status working
  424. - fourcc ZLIB
  425. - driver lcl
  426. - out BGR24
  427. -
  428. -;XAnim (slow):
  429. -
  430. -videocodec cvidxa
  431. - info "XAnim's Radius Cinepak Video"
  432. - status buggy
  433. - fourcc cvid
  434. - driver xanim
  435. - dll "vid_cvid.xa"
  436. - out YV12,IYUV,I420 static
  437. -
  438. ; time to decide what to do with the mpeg4/divx variants...
  439. ; ff* is fastest...
  440.  
  441. -videocodec ffhuffyuv
  442. - info "FFHuffYUV"
  443. - status working
  444. - fourcc HFYU
  445. - driver ffmpeg
  446. - dll huffyuv
  447. - out YV12,YUY2,422P
  448. - out BGR32,BGR24
  449. -
  450. -videocodec ffsvq1
  451. - info "FFmpeg Sorenson Video v1"
  452. - status working
  453. - fourcc SVQ1
  454. - driver ffmpeg
  455. - dll svq1
  456. - out YVU9
  457. -
  458. videocodec ffdivx
  459. info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
  460. status working
  461. @@ -305,365 +83,8 @@
  462. dll mpeg4 ;opendivx
  463. out YV12,I420,IYUV
  464.  
  465. -videocodec xvid
  466. - info "Xvid (MPEG-4)"
  467. - status working
  468. - fourcc DIVX,divx
  469. - fourcc xvid,XVID,XviD
  470. - format 0x4
  471. - driver xvid
  472. - out YV12
  473. - out I420
  474. - out YUY2
  475. - out UYVY
  476. - out YVYU
  477. - out BGR32,BGR24,BGR16,BGR15
  478. - dll "libxvidcore.a"
  479. -
  480. -; divx4 does direct render, and is native on linux
  481. -
  482. -videocodec odivx
  483. - info "OpenDivX API (ODIVX,DIVX4,DIVX5,XVID)"
  484. - comment "with postprocessing"
  485. - status working
  486. - fourcc mp4v
  487. - fourcc DIVX,divx
  488. - fourcc DIV1,div1 divx
  489. -; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
  490. - fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
  491. - fourcc AP41 DIV3 ; AngelPotion stuff
  492. - fourcc xvid,XVID,XviD
  493. - fourcc DX50,BLZ0 DX50
  494. - format 0x4
  495. - driver odivx
  496. - dll "libdivxdecore.so"
  497. - out YV12,I420,IYUV
  498. -
  499. -videocodec divx4
  500. - info "DivX4Linux API (DIVX4,DIVX5,XVID)"
  501. - comment "with postprocessing"
  502. - status working
  503. - fourcc mp4v
  504. - fourcc DIVX,divx
  505. - fourcc DIV1,div1 divx
  506. -; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
  507. - fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
  508. - fourcc AP41 DIV3 ; AngelPotion stuff
  509. - fourcc xvid,XVID,XviD
  510. - fourcc DX50,BLZ0 DX50
  511. - format 0x4
  512. - driver divx4
  513. - dll "libdivxdecore.so"
  514. -; out I420 ; planar direct rendering
  515. - out YUY2
  516. - out UYVY
  517. - out BGR32,BGR24,BGR16,BGR15
  518. -
  519. -; is divx4vfw stable enough, working everywhere and faster than divxds?
  520. -
  521. -videocodec divx4vfw
  522. - info "DivX4Windows-VFW"
  523. - status buggy
  524. - comment "sig11 with -framedrop"
  525. - fourcc DIVX,divx ; opendivx / divx4
  526. - fourcc DIV1,div1 divx
  527. -; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
  528. - fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
  529. - fourcc AP41 DIV3 ; AngelPotion stuff
  530. - format 0x4
  531. - driver vfw
  532. - dll "divx.dll"
  533. -; out YV12 ; buggy
  534. - out YUY2
  535. - out BGR32,BGR24,BGR15
  536. -
  537. -; the original ones... prefer DShow for postprocessing:
  538. -
  539. -videocodec divxds
  540. - info "DivX ;-) (MS MPEG-4 v3)"
  541. - comment "with postprocessing"
  542. - status working
  543. - fourcc MP43,mp43 div3 ; fourcc mapping to div3
  544. - fourcc DIV5,div5 div3
  545. - fourcc DIV6,div6 div4
  546. - fourcc DIV3,div3,DIV4,div4
  547. - fourcc AP41 div3 ; AngelPotion stuff
  548. - driver dshow
  549. - dll "divx_c32.ax"
  550. - guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
  551. - out YUY2,UYVY
  552. - out BGR32,BGR24,BGR16,BGR15
  553. -
  554. -videocodec divx
  555. - info "DivX ;-) (MS MPEG-4 v3)"
  556. - status working
  557. - fourcc MP43,mp43 div3 ; M$ MPEG4 v3 (fourcc mapping to div3)
  558. - fourcc DIV5,div5 div3 ; DivX 3.20
  559. - fourcc DIV6,div6 div4 ; -||-
  560. - fourcc DIV3,div3,DIV4,div4
  561. - fourcc AP41 div3 ; AngelPotion stuff
  562. - driver vfw
  563. - dll "divxc32.dll"
  564. - out YUY2 yuvhack
  565. - out BGR32,BGR24,BGR15
  566. -
  567. -; hmm. we should check, maybe these are/will be playable with libavcodec:
  568. -
  569. -videocodec mpeg4ds
  570. - info "Microsoft MPEG-4 v1/v2"
  571. - status working
  572. - comment "with postprocessing"
  573. - fourcc DIV2,div2 mp42
  574. - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
  575. - fourcc MPG4,mpg4
  576. - fourcc MP42,mp42
  577. - driver dshow
  578. - dll "mpg4ds32.ax"
  579. - guid 0x82CCD3E0, 0xF71A, 0x11D0, 0x9F, 0xE5, 0x00, 0x60, 0x97, 0x78, 0xEA, 0x66
  580. - out YUY2
  581. - out BGR32,BGR24,BGR16,BGR15
  582. -
  583. -videocodec mpeg4
  584. - info "Microsoft MPEG-4 v1/v2"
  585. - status working
  586. - fourcc MPG4,mpg4
  587. - fourcc MP42,mp42
  588. - fourcc DIV2 mp42
  589. - driver vfw
  590. - dll "mpg4c32.dll"
  591. - out YUY2 yuvhack
  592. - out BGR32,BGR24,BGR15
  593. -
  594. -videocodec wmv8
  595. - info "Windows Media Video 8"
  596. - status working
  597. - fourcc WMV2
  598. - driver dshow
  599. - dll "wmv8ds32.ax"
  600. - guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
  601. - out YV12,I420,IYUV
  602. - out YUY2,UYVY
  603. - out BGR32,BGR24,BGR16,BGR15
  604. -
  605. -videocodec wmv7
  606. - info "Windows Media Video 7"
  607. - status working
  608. - fourcc WMV1
  609. - driver dshow
  610. - dll "wmvds32.ax"
  611. - guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
  612. - out YUY2,UYVY
  613. - out BGR32,BGR24,BGR16,BGR15
  614. -
  615. -videocodec wmv9dmo
  616. - info "Windows Media Video 9 DMO"
  617. - status working
  618. - fourcc WMV3
  619. - driver dmo
  620. - dll "wmv9dmod.dll"
  621. - guid 0x724bb6a4, 0xe526, 0x450f, 0xaf, 0xfa, 0xab, 0x9b, 0x45, 0x12, 0x91, 0x11
  622. - out YV12 ;,I420,IYUV
  623. - out YUY2,UYVY
  624. - out BGR32,BGR24,BGR16 ;,BGR15
  625. -
  626. -videocodec wmvdmo
  627. - info "Windows Media Video DMO"
  628. - status working
  629. - fourcc WMV1
  630. - fourcc WMV2
  631. - fourcc WMV3
  632. - driver dmo
  633. - dll "wmvdmod.dll"
  634. - guid 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34
  635. - out YV12 ;,I420,IYUV
  636. - out YUY2,UYVY
  637. - out BGR32,BGR24,BGR16 ;,BGR15
  638. -
  639. -videocodec ubmp4
  640. - info "UB Video MPEG 4"
  641. - comment "black&white"
  642. - status buggy
  643. - fourcc mp4v UMP4 ; black&white, sometimes buggy too
  644. - fourcc UMP4
  645. - driver vfw
  646. - dll "ubvmp4d.dll"
  647. - out I420
  648. - out UYVY
  649. -
  650. -
  651. -; mjpegs:
  652. -; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
  653. -; ijpg only decodes jpeg images (no mjpg), and slow.
  654. -; Update: ffmjpeg is almost perfect (and optimized) now, prefer it to others.
  655. -
  656. -videocodec ffmjpeg
  657. - info "FFmpeg MJPEG decoder"
  658. - status working
  659. - fourcc MJPG,mjpg
  660. - fourcc AVRn,AVDJ ; AVID
  661. - fourcc jpeg ; MOV photo-jpeg
  662. - fourcc mjpa ; Apple MJPEG-A (Quicktime)
  663. - fourcc JFIF ; SMJPEG (Loki)
  664. - fourcc ijpg,IJPG ; -mf type=jpeg
  665. - fourcc JPEG ; SGI's AVI Photo-jpeg
  666. - driver ffmpeg
  667. - dll mjpeg
  668. - out 444P
  669. - out 422P
  670. - out YUY2 ; queryed (conversion from yuv422p)
  671. - out YV12,I420,IYUV
  672. -
  673. -; slow. usable only for standalone jpegs, like -mf, avid or photojpeg:
  674. -videocodec ijpg
  675. - info "Independent JPEG Group's codec"
  676. - status working
  677. - fourcc ijpg,IJPG ; -mf type=jpeg
  678. - fourcc jpeg ; MOV Photo Jpeg
  679. - fourcc AVRn,AVDJ ; AVID
  680. - driver ijpg
  681. - dll libjpeg
  682. - out RGB24,BGR24,BGR32
  683. -
  684. -; http://www.morgan-multimedia.com/dev/codec_spec.htm
  685. -videocodec m3jpeg
  686. - info "Morgan Motion JPEG Codec"
  687. - status working
  688. - fourcc MJPG
  689. - fourcc mjpa,mjpb,mjpg MJPG ; MOV files
  690. - fourcc dmb1 MJPG ; MJPEG by Matrox Rainbow Runner
  691. - driver vfw
  692. - dll "m3jpeg32.dll"
  693. -; out YV12,I420
  694. - out YUY2,UYVY
  695. - out BGR32,BGR24,BGR15
  696. -
  697. -videocodec mjpeg
  698. - info "MainConcept Motion JPEG"
  699. - status working
  700. - fourcc MJPG
  701. - fourcc mjpa,mjpb,mjpg MJPG ; MOV files
  702. -; fourcc AVRn,AVDJ MJPG ; AVID (sometimes buggy)
  703. - driver vfw
  704. - dll "mcmjpg32.dll"
  705. - out YUY2,UYVY
  706. - out BGR32,BGR24,BGR15
  707. -
  708. -videocodec avid
  709. - info "AVID Motion JPEG"
  710. - status working
  711. - comment "slooooooooow but stable"
  712. - fourcc AVRn
  713. - fourcc AVDJ AVRn
  714. - fourcc MJPG,mjpg AVRn
  715. - driver vfw
  716. - dll "AvidAVICodec.dll"
  717. - out BGR24 flip
  718. -
  719. -videocodec LEAD
  720. - info "LEAD (M)Jpeg"
  721. - status working
  722. - comment "supports interlaced MJPEG"
  723. - fourcc MJPG
  724. - fourcc jpeg MJPG ; MOV Photo Jpeg
  725. - driver vfw
  726. - dll "LCodcCMP.dll"
  727. - out BGR24,BGR15
  728. -
  729. -videocodec imagepower
  730. - info "ImagePower MJPEG2000"
  731. - status buggy
  732. - fourcc IPJ2
  733. - driver vfw
  734. - dll "jp2avi.dll"
  735. - out BGR32,BGR24,BGR15
  736. -
  737. -videocodec m3jpeg2k
  738. - info "Morgan MJPEG2000"
  739. - status working
  740. - fourcc MJ2C
  741. - driver vfw
  742. - dll "m3jp2k32.dll"
  743. - out YV12,I420,IYUV
  744. - out YUY2,UYVY
  745. - out BGR32,BGR24,BGR15
  746. -
  747. -; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm
  748. -videocodec m3jpegds
  749. - info "Morgan MJPEG"
  750. - status crashing
  751. - fourcc MJPG mjpg
  752. - fourcc mjpa,mjpb,mjpg mjpg ; MOV files
  753. - fourcc dmb1 mjpg ; MJPEG by Matrox Rainbow Runner
  754. - driver dshow
  755. - dll "m3jpegdec.ax"
  756. - guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68
  757. - out I420
  758. - out YUY2,UYVY
  759. - out BGR32,BGR24,BGR16,BGR15
  760. -
  761. -videocodec pegasusm
  762. - info "Pegasus Motion JPEG"
  763. - status crashing
  764. - fourcc MJPG
  765. - driver vfw
  766. -; dll "pvmjpg20.dll" ; v2.0
  767. - dll "pvmjpg21.dll" ; v2.1
  768. - out BGR24 flip
  769. -
  770. -videocodec pegasusl
  771. - info "Pegasus Lossless JPEG"
  772. - status crashing
  773. - fourcc JPGL
  774. - fourcc MJPG JPGL
  775. - driver vfw
  776. - dll "pvljpg20.dll"
  777. - out BGR24 flip
  778. -
  779. -videocodec pegasusmwv
  780. - info "Pegasus Motion Wavelet 2000"
  781. - status crashing
  782. - fourcc PVW2
  783. - driver vfw
  784. - dll "pvwv220.dll"
  785. - out BGR24 flip
  786. -
  787. ; h263: - I don't know. comments?
  788.  
  789. -videocodec vivo
  790. - info "Vivo H.263"
  791. - status working
  792. - fourcc VIVO,vivo vivo
  793. - fourcc viv1,viv2 vivo
  794. - driver vfw
  795. - dll "ivvideo.dll"
  796. - out BGR32,BGR24,BGR15 flip
  797. - in BGR24
  798. -
  799. -videocodec u263
  800. - info "UB Video H.263/H.263+/H.263++ Decoder"
  801. - status working
  802. - fourcc U263
  803. - fourcc vivo,VIVO U263
  804. - fourcc viv1 U263
  805. - driver dshow
  806. - dll "ubv263d+.ax"
  807. - guid 0x00af1181, 0x6ebb, 0x11d4, 0x9d, 0x5a, 0x00, 0x50, 0x04, 0x79, 0x6c, 0xc0
  808. -; out UYVY
  809. -; BGR32,BGR16,BGR15 seems to work too
  810. - out BGR24 flip
  811. -
  812. -videocodec i263
  813. - info "I263"
  814. - status working
  815. - fourcc I263,i263,I420,i420
  816. - fourcc vivo,VIVO I263
  817. - fourcc viv1 I263
  818. - driver vfw
  819. - dll "i263_32.drv"
  820. - out I420
  821. - out YUY2
  822. - out BGR32,BGR24,BGR15
  823. -
  824. videocodec ffi263
  825. info "FFmpeg I263 decoder"
  826. status working
  827. @@ -681,488 +102,6 @@
  828. dll h263
  829. out YV12,I420,IYUV
  830.  
  831. -videocodec h263xa
  832. - info "XAnim's CCITT H.263"
  833. - status crashing
  834. - fourcc H263,h263
  835. - fourcc viv1 H263
  836. - fourcc VIVO,vivo H263
  837. - driver xanim
  838. - dll "vid_h263.xa"
  839. - out YV12,IYUV,I420
  840. -
  841. -videocodec h261xa
  842. - info "XAnim's CCITT H.261"
  843. - status untested
  844. - fourcc H261,h261
  845. - driver xanim
  846. - dll "vid_h261.xa"
  847. - out YV12,IYUV,I420
  848. -
  849. -videocodec m261
  850. - info "M261"
  851. - status untested
  852. - fourcc m261,M261
  853. - driver vfw
  854. - dll "msh261.drv"
  855. - out BGR32,BGR24,BGR15
  856. -
  857. -; indeo:
  858. -; Note: indeo 3 is buggy, both xanim (bad decoding) and VfW (not work with DR)
  859. -; Prefer win32 ones, they are faster, and 4/5 can DR. for fallback, there are
  860. -; Xanim codecs, they provide YV12, useful for YUV display or encoding.
  861. -
  862. -videocodec indeo5ds
  863. - info "Intel Indeo 5"
  864. - status working
  865. - fourcc IV50,iv50
  866. - driver dshow
  867. - dll "ir50_32.dll"
  868. - guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
  869. - out YV12,IYUV,I420
  870. - out YUY2,UYVY
  871. - out BGR32,BGR24,BGR16,BGR15
  872. -
  873. -videocodec indeo5
  874. - info "Intel Indeo 5"
  875. - status working
  876. - fourcc IV50,iv50
  877. - driver vfwex
  878. - dll "ir50_32.dll"
  879. -; out YV12,I420 ; flickering
  880. - out YUY2
  881. - out BGR32,BGR24,BGR15
  882. -
  883. -videocodec indeo4
  884. - info "Intel Indeo 4.1"
  885. - status working
  886. - fourcc IV41,iv41
  887. - driver vfw
  888. - dll "ir41_32.dll"
  889. - out IF09
  890. - out BGR24,BGR15
  891. - in YVU9
  892. -
  893. -videocodec indeo3
  894. - info "Intel Indeo 3.1/3.2"
  895. - status working
  896. - fourcc IV31,iv31
  897. - fourcc IV32,iv32
  898. - driver vfwex
  899. - dll "ir32_32.dll"
  900. - out IF09
  901. - out BGR24,BGR15 flip,static
  902. - in YVU9
  903. -
  904. -videocodec indeo5xa
  905. - info "XAnim's Intel Indeo 5"
  906. - status working
  907. - fourcc IV50,iv50
  908. - driver xanim
  909. - dll "vid_iv50.xa"
  910. - out YVU9
  911. -
  912. -videocodec indeo4xa
  913. - info "XAnim's Intel Indeo 4.1"
  914. - status working
  915. - fourcc IV41,iv41
  916. - driver xanim
  917. - dll "vid_iv41.xa"
  918. - out YVU9
  919. -
  920. -videocodec indeo3xa
  921. - info "XAnim's Intel Indeo 3.1/3.2"
  922. - status working
  923. - fourcc IV31,iv31
  924. - fourcc IV32,iv32
  925. - driver xanim
  926. - dll "vid_iv32.xa"
  927. - out YVU9
  928. -
  929. -; DV: qdv is more stable... libdv is slow, mcdv is unstable
  930. -
  931. -videocodec qdv
  932. - info "Sony Digital Video (DV)"
  933. - status working
  934. - fourcc dvsl,dvsd,dvhd ; ????
  935. - fourcc DVSD dvsd ; pal .avi
  936. - fourcc "dvcp" dvsd ; pal .mov
  937. - fourcc "dvc " dvsd ; ntsc .mov
  938. - driver dshow
  939. - dll "qdv.dll"
  940. - guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42
  941. - out YUY2
  942. - out UYVY
  943. - out BGR24,BGR16,BGR15 ; BGR32 is buggy, at least with one sample
  944. -
  945. -videocodec ffdv
  946. - info "FFmpeg DV decoder"
  947. - status working
  948. - fourcc DVSD,dvsd ; PAL
  949. - fourcc DVCS,dvcs ; NTSC ?
  950. - fourcc "dvcp" ; PAL DV in .mov
  951. - fourcc "dvc " ; NTSC DV in .mov
  952. - driver ffmpeg
  953. - dll dvvideo
  954. - out 411P,YV12
  955. -
  956. -videocodec libdv
  957. - info "Raw DV decoder (libdv)"
  958. - status working
  959. - fourcc DVSD,dvsd ; PAL
  960. - fourcc DVCS,dvcs ; NTSC ?
  961. - fourcc "dvcp" ; PAL DV in .mov
  962. - fourcc "dvc " ; NTSC DV in .mov
  963. - driver libdv
  964. - dll libdv.so.2
  965. - out YUY2
  966. -
  967. -; note: it crashes with pond.dv :(
  968. -videocodec mcdv
  969. - info "MainConcept DV Codec"
  970. - status working
  971. - fourcc DVSD,dvsd ; PAL
  972. - fourcc DVCS,dvcs ; NTSC ?
  973. - fourcc CDVC,cdvc ; ???
  974. - fourcc "dvcp" dvsd ; PAL DV in .mov
  975. - fourcc "dvc " dvcs ; NTSC DV in .mov
  976. - driver vfw
  977. - dll "mcdvd_32.dll"
  978. - out YUY2
  979. - out UYVY
  980. - out BGR32,BGR24,BGR15
  981. -
  982. -; 3ivx:
  983. -
  984. -videocodec 3ivXxa
  985. - info "XAnim's 3ivX Delta 3.5 plugin"
  986. - status working
  987. - fourcc 3IV1
  988. - driver xanim
  989. - dll "vid_3ivX.xa"
  990. - out YV12,IYUV,I420
  991. -
  992. -videocodec 3ivX
  993. - info "3ivX Delta 3.5"
  994. - status crashing
  995. - fourcc 3IV1
  996. - driver dshow
  997. - dll "3ivxdmo.dll"
  998. - guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
  999. - out YV12
  1000. - out YUY2
  1001. - out BGR32,BGR24,BGR16,BGR15
  1002. -
  1003. -; experimental real video decoder using closed source codecs
  1004. -
  1005. -videocodec rv40
  1006. - info "Linux RealPlayer 9 RV40 decoder"
  1007. - status working
  1008. - fourcc RV40,rv40
  1009. - driver realvid
  1010. - dll "drv4.so.6.0"
  1011. - out I420
  1012. -
  1013. -videocodec rv40win
  1014. - info "Win32 RealPlayer 9 RV40 decoder"
  1015. - status working
  1016. - fourcc RV40,rv40
  1017. - driver realvid
  1018. - dll "drv43260.dll"
  1019. - out I420
  1020. -
  1021. -videocodec rv30
  1022. - info "Linux RealPlayer 8 RV30 decoder"
  1023. - status working
  1024. - fourcc RV30,rv30
  1025. - driver realvid
  1026. - dll "drv3.so.6.0"
  1027. - out I420
  1028. -
  1029. -videocodec rv30win
  1030. - info "Win32 RealPlayer 8 RV30 decoder"
  1031. - status working
  1032. - fourcc RV30,rv30
  1033. - driver realvid
  1034. - dll "drv33260.dll"
  1035. - out I420
  1036. -
  1037. -videocodec rv20
  1038. - info "Linux RealPlayer 8 RV20 decoder"
  1039. - status working
  1040. - fourcc RV20,rv20
  1041. - driver realvid
  1042. - dll "drv2.so.6.0"
  1043. - out I420
  1044. -
  1045. -videocodec rv20win
  1046. - info "Win32 RealPlayer 8 RV20 decoder"
  1047. - status working
  1048. - fourcc RV20,rv20
  1049. - driver realvid
  1050. - dll "drv23260.dll"
  1051. - out I420
  1052. -
  1053. -; others:
  1054. -
  1055. -videocodec ffrv10
  1056. - info "FFmpeg RV10 decoder"
  1057. - status working
  1058. - fourcc RV10,rv10
  1059. - fourcc RV13,rv13
  1060. - driver ffmpeg
  1061. - dll rv10
  1062. - out YV12,I420,IYUV
  1063. -
  1064. -videocodec vp3
  1065. - info "On2 OpenSource VP3-Codec"
  1066. - status working
  1067. - comment "For SSE-systems use fixed dll from ftp://mplayerhq.hu/MPlayer/samples/drivers32/"
  1068. - fourcc VP30,vp30,VP31,vp31
  1069. - flags align16
  1070. - driver vfwex
  1071. - dll "vp31vfw.dll"
  1072. - out YUY2
  1073. - out BGR32,BGR24,BGR15
  1074. -
  1075. -videocodec mwv1
  1076. - info "Motion Wavelets"
  1077. - status working
  1078. - fourcc MWV1
  1079. - driver vfw
  1080. - dll "icmw_32.dll"
  1081. - out BGR24,BGR15 flip
  1082. -
  1083. -videocodec asv2
  1084. - info "ASUS V2"
  1085. - status working
  1086. - fourcc ASV2
  1087. - driver vfw
  1088. - dll "asusasv2.dll"
  1089. - out UYVY
  1090. - out BGR32,BGR24,BGR15 flip
  1091. -
  1092. -videocodec asv1
  1093. - info "ASUS V1"
  1094. - status working
  1095. - fourcc ASV1
  1096. - driver vfw
  1097. - dll "asusasvd.dll"
  1098. - out UYVY
  1099. - out BGR32,BGR24,BGR15 flip
  1100. -
  1101. -videocodec mss1
  1102. - info "Windows Screen Video"
  1103. - status working
  1104. - fourcc MSS1
  1105. - driver dshow
  1106. - dll "msscds32.ax"
  1107. - guid 0x3301a7c4, 0x0a8d, 0x11d4, 0x91, 0x4d, 0x00, 0xc0, 0x4f, 0x61, 0x0d, 0x24
  1108. - out BGR32,BGR24,BGR16,BGR15
  1109. -
  1110. -; CLRVIDDC.DLL needed too, with uppercase
  1111. -videocodec ucod
  1112. - info "UCOD-ClearVideo"
  1113. - status working
  1114. - fourcc UCOD
  1115. - driver vfw
  1116. - dll "clrviddd.dll"
  1117. - out BGR32,BGR24,BGR15 flip
  1118. -
  1119. -videocodec vcr2
  1120. - info "ATI VCR-2"
  1121. - status working
  1122. - fourcc VCR2
  1123. - driver vfw
  1124. - dll "ativcr2.dll"
  1125. - out YV12
  1126. - out BGR24
  1127. -
  1128. -videocodec CJPG
  1129. - info "CJPG"
  1130. - status untested
  1131. - comment "need sample files (this dll is decompression only!)"
  1132. - fourcc CJPG
  1133. - driver vfw
  1134. - dll "CtWbJpg.DLL"
  1135. - out YUY2
  1136. - out UYVY
  1137. - out BGR24,BGR15
  1138. -
  1139. -; our BGR15->BGR32 is bad or the DLL?
  1140. -videocodec tm20
  1141. - info "TrueMotion 2.0"
  1142. - status working
  1143. - comment "YUV faulting"
  1144. - fourcc TM20
  1145. - driver dshow
  1146. - dll "tm20dec.ax"
  1147. - guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
  1148. - out BGR32,BGR24,BGR16
  1149. -
  1150. -videocodec sp5x
  1151. - info "SP5x codec - used by Aiptek MegaCam"
  1152. - status working
  1153. - fourcc SP53,SP54,SP55,SP56,SP57,SP58
  1154. - driver vfw
  1155. - dll "sp5x_32.dll"
  1156. - out BGR24,BGR15
  1157. -
  1158. -; quicktime codecs:
  1159. -
  1160. -videocodec qt3ivx
  1161. - info "win32/quicktime 3IV1 (3ivx) decoder"
  1162. - status working
  1163. - fourcc 3IV1
  1164. - driver qtvideo
  1165. - dll "3ivx Delta 3.5.qtx"
  1166. - out YUY2
  1167. -
  1168. -videocodec qth263
  1169. - info "win32/quicktime H.263 decoder"
  1170. - status crashing
  1171. - fourcc h263
  1172. - driver qtvideo
  1173. - dll "QuickTime.qts"
  1174. - out YUY2
  1175. -
  1176. -videocodec qtrlerpza
  1177. - info "win32/quicktime RLE/RPZA decoder"
  1178. - comment "no colorspace accepted"
  1179. - status crashing
  1180. - fourcc rpza
  1181. - format 0x20656C72 ; "rle "
  1182. - driver qtvideo
  1183. - dll "QuickTime.qts"
  1184. - out BGR32,BGR24,BGR15
  1185. -
  1186. -videocodec qtvp3
  1187. - info "win32/quicktime VP3 decoder"
  1188. - status crashing
  1189. - fourcc VP31
  1190. - driver qtvideo
  1191. - dll "On2_VP3.qtx"
  1192. - out YUY2
  1193. -
  1194. -videocodec qtzygo
  1195. - info "win32/quicktime ZyGo decoder"
  1196. - status buggy
  1197. - comment "wrong colors"
  1198. - fourcc ZyGo,zygo,lsvx
  1199. - driver qtvideo
  1200. - dll "ZyGoVideo.qtx"
  1201. - out BGR32,RGB32
  1202. -
  1203. -videocodec qtbhiv
  1204. - info "win32/quicktime BeHereiVideo decoder"
  1205. - comment "sample file wanted!"
  1206. - status untested
  1207. - fourcc bhiv
  1208. - driver qtvideo
  1209. - dll "BeHereiVideo.qtx"
  1210. - out YUY2
  1211. -
  1212. -videocodec qtsvq3
  1213. - info "win32/quicktime SVQ3 decoder"
  1214. - status working
  1215. - fourcc SVQ3
  1216. - driver qtvideo
  1217. - dll "QuickTimeEssentials.qtx"
  1218. - out YUY2
  1219. -
  1220. -videocodec qtsvq1
  1221. - info "win32/quicktime SVQ1 decoder"
  1222. - status buggy
  1223. - fourcc SVQ1
  1224. - driver qtvideo
  1225. - dll "QuickTime.qts"
  1226. - out YVU9
  1227. -
  1228. -; buggy codecs: (any volunteers for native rewrite?)
  1229. -
  1230. -videocodec zlib
  1231. - info "AVIzlib"
  1232. - status working
  1233. - comment "24bpp only"
  1234. - fourcc ZLIB
  1235. - driver vfw
  1236. - dll "avizlib.dll"
  1237. - out BGR24 flip
  1238. -
  1239. -videocodec mszh
  1240. - info "AVImszh"
  1241. - status working
  1242. - comment "24bpp only"
  1243. - fourcc MSZH
  1244. - driver vfw
  1245. - dll "avimszh.dll"
  1246. -; out YUY2
  1247. -; out BGR32,BGR24,BGR15
  1248. - out BGR24
  1249. -
  1250. -videocodec alaris
  1251. - info "Alaris VideoGramPiX"
  1252. -; http://www.alaris.com/movies/toocool.vgm
  1253. -; Martin Schuster <schuster@ap.univie.ac.at>
  1254. - status crashing
  1255. - comment "only produces strange patterns"
  1256. - fourcc VGPX,VTLP VGPX
  1257. - driver vfwex
  1258. - dll "vgpix32d.dll"
  1259. - out UYVY
  1260. - out BGR24
  1261. -
  1262. -
  1263. -; non-working codecs:
  1264. -
  1265. -videocodec vcr1
  1266. - info "ATI VCR-1"
  1267. - status crashing
  1268. - fourcc VCR1
  1269. - driver vfw
  1270. - dll "ativcr1.dll"
  1271. - out RGB24 flip
  1272. -
  1273. -videocodec pim1
  1274. - info "Pinnacle Hardware MPEG1"
  1275. - status crashing
  1276. - comment "no picture. use ffmpeg12!"
  1277. - fourcc PIM1
  1278. - driver vfw
  1279. - dll "pclepim1.dll"
  1280. - out BGR24 flip
  1281. -; out I420
  1282. -; out YUY2
  1283. -; out BGR32,BGR24,BGR16,BGR15
  1284. -
  1285. -videocodec qpeg
  1286. - info "Q-Team's QPEG (www.q-team.de)"
  1287. - status working
  1288. - comment "BGR8 only!"
  1289. - fourcc Q1.0,QPEG
  1290. - fourcc Q1.1,qpeq
  1291. - driver vfw
  1292. - dll "qpeg32.dll"
  1293. - out BGR8 flip
  1294. -
  1295. -videocodec rricm
  1296. - info "rricm"
  1297. - status crashing
  1298. - fourcc dmb1
  1299. - driver vfw
  1300. - dll "rricm.dll"
  1301. - out YUY2
  1302. - out BGR24 flip
  1303. -
  1304. -; sample videos: http://www.techsmith.com/products/camtasia/examplevideos.asp
  1305. -videocodec camtasia
  1306. - info "TechSmith Camtasia Screen Codec"
  1307. - status working
  1308. - fourcc TSCC,tscc
  1309. - driver vfw
  1310. - dll "tsccvid.dll"
  1311. - out BGR15 flip
  1312. -
  1313. ; raw formats: (now RGB formats are autodetected)
  1314.  
  1315. ; these raw codecs are used mostly by tv input
  1316. @@ -1314,73 +253,17 @@
  1317. ; AUDIO CODECS
  1318. ;=============================================================================
  1319.  
  1320. -audiocodec wma9dmo
  1321. - info "Windows Media Audio 9 DMO"
  1322. - status working
  1323. - format 0x162
  1324. - driver dmo
  1325. - dll "wma9dmod.dll"
  1326. - guid 0x27ca0808, 0x01f5, 0x4e7a, 0x8b, 0x05, 0x87, 0xf8, 0x07, 0xa2, 0x33, 0xd1
  1327. -
  1328. -audiocodec wmadmo
  1329. - info "Windows Media Audio DMO"
  1330. - status working
  1331. - format 0x160
  1332. - format 0x161
  1333. - format 0x162
  1334. - driver dmo
  1335. - dll "wmadmod.dll"
  1336. - guid 0x2eeb4adf, 0x4578, 0x4d10, 0xbc, 0xa7, 0xbb, 0x95, 0x5f, 0x56, 0x32, 0x0a
  1337. -
  1338. -audiocodec qdmc
  1339. - info "Quicktime QDMC/QDM2 audio decoders"
  1340. - status working
  1341. - format 0x324D4451 ; "QDM2"
  1342. - format 0x434D4451 ; "QDMC"
  1343. - driver qtaudio
  1344. - dll "QuickTime.qts"
  1345. -
  1346. -audiocodec qclp
  1347. - info "Quicktime QCLP audio decoder"
  1348. - status working
  1349. - format 0x706C6351 ; "QCLP"
  1350. - driver qtaudio
  1351. - dll "QuickTime.qts"
  1352. -
  1353. -audiocodec qtmace3
  1354. - info "Quicktime MACE3 audio decoder"
  1355. - status working
  1356. - format 0x3343414D ; "MAC3"
  1357. - driver qtaudio
  1358. - dll "QuickTime.qts"
  1359. -
  1360. -audiocodec qtmace6
  1361. - info "Quicktime MACE6 audio decoder"
  1362. - status working
  1363. - format 0x3643414D ; "MAC6"
  1364. - driver qtaudio
  1365. - dll "QuickTime.qts"
  1366. -
  1367. -audiocodec racook
  1368. - info "RealAudio COOK"
  1369. - status working
  1370. - format 0x6B6F6F63 ; "cook"
  1371. - driver realaud
  1372. - dll "cook.so.6.0"
  1373. -
  1374. -audiocodec rasipr
  1375. - info "RealAudio Sipro"
  1376. - status working
  1377. - format 0x72706973 ; "sipr"
  1378. - driver realaud
  1379. - dll "sipr.so.6.0"
  1380. -
  1381. -audiocodec raatrc
  1382. - info "RealAudio ATRAC3"
  1383. +;MAD library
  1384. +audiocodec mad
  1385. + info "libMAD MPEG layer 1-2-3"
  1386. status working
  1387. - format 0x63727461 ; "atrc"
  1388. - driver realaud
  1389. - dll "atrc.so.6.0"
  1390. + format 0x50
  1391. + format 0x55
  1392. + format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
  1393. + format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
  1394. + driver libmad
  1395. + dll "libmad"
  1396. + flags seekable
  1397.  
  1398. audiocodec imaadpcm
  1399. info "IMA ADPCM"
  1400. @@ -1397,41 +280,6 @@
  1401. format 0x0200736d ; "ms\x00\x02" (MOV files)
  1402. driver msadpcm
  1403.  
  1404. -audiocodec dk4adpcm
  1405. - info "Duck DK4 ADPCM (rogue format number)"
  1406. - status working
  1407. - comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
  1408. - format 0x61
  1409. - driver imaadpcm
  1410. -
  1411. -audiocodec dk3adpcm
  1412. - info "Duck DK3 ADPCM (rogue format number)"
  1413. - status working
  1414. - comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
  1415. - format 0x62
  1416. - driver dk3adpcm
  1417. -
  1418. -audiocodec roqaudio
  1419. - info "Id RoQ File Audio Decoder"
  1420. - status working
  1421. - comment "RoQA is an internal MPlayer FOURCC"
  1422. - fourcc RoQA
  1423. - driver roqaudio
  1424. -
  1425. -audiocodec libdv
  1426. - info "raw DV audio decoder (libdv)"
  1427. - status working
  1428. - fourcc RADV
  1429. - driver libdv
  1430. - dll libdv.so.2
  1431. -
  1432. -audiocodec faad
  1433. - info "AAC MPEG2/MPEG4 Audio"
  1434. - status working
  1435. - fourcc mp4a,MP4A
  1436. - driver faad
  1437. - dll libfaad2
  1438. -
  1439. audiocodec pcm
  1440. info "Uncompressed PCM"
  1441. status working
  1442. @@ -1448,133 +296,6 @@
  1443. ;;;;
  1444. driver pcm
  1445.  
  1446. -audiocodec divx
  1447. - info "DivX audio (WMA)"
  1448. - status working
  1449. - format 0x160
  1450. - format 0x161
  1451. - driver acm
  1452. - dll "divxa32.acm"
  1453. -
  1454. -audiocodec msadpcmacm
  1455. - info "MS ADPCM"
  1456. - status working
  1457. - format 0x2
  1458. - driver acm
  1459. - dll "msadp32.acm"
  1460. -
  1461. -audiocodec mp3
  1462. - info "mp3lib MPEG layer-2, layer-3"
  1463. - status working
  1464. - comment "Optimized to MMX/SSE/3Dnow!"
  1465. - format 0x50 ; layer-1 && layer-2
  1466. - format 0x55 ; layer-3
  1467. - format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
  1468. - format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
  1469. - driver mp3lib
  1470. - flags seekable
  1471. -
  1472. -audiocodec ffwmav1
  1473. - info "DivX audio v1 (ffmpeg)"
  1474. - status untested
  1475. - format 0x160
  1476. - driver ffmpeg
  1477. - dll "wmav1"
  1478. -
  1479. -audiocodec ffwmav2
  1480. - info "DivX audio v2 (ffmpeg)"
  1481. - status untested
  1482. - format 0x161
  1483. - driver ffmpeg
  1484. - dll "wmav2"
  1485. -
  1486. -audiocodec ffmac3
  1487. - info "Macintosh Audio Compression and Expansion 3:1"
  1488. - status untested
  1489. - fourcc "MAC3"
  1490. - driver ffmpeg
  1491. - dll "mace3"
  1492. -
  1493. -audiocodec ffmac6
  1494. - info "Macintosh Audio Compression and Expansion 6:1"
  1495. - status untested
  1496. - fourcc "MAC6"
  1497. - driver ffmpeg
  1498. - dll "mace6"
  1499. -
  1500. -audiocodec ffmp3
  1501. - info "FFmpeg layer-3 audio decoder"
  1502. - comment "integer only"
  1503. - status working
  1504. - format 0x55
  1505. - format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
  1506. - format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
  1507. - driver ffmpeg
  1508. - dll "mp3"
  1509. - flags seekable
  1510. -
  1511. -audiocodec ffmp2
  1512. - info "FFmpeg layer 1,2 audio decoder"
  1513. - comment "integer only"
  1514. - status working
  1515. - format 0x50
  1516. - driver ffmpeg
  1517. - dll "mp2"
  1518. - flags seekable
  1519. -
  1520. -;MAD library
  1521. -audiocodec mad
  1522. - info "libMAD MPEG layer 1-2-3"
  1523. - status working
  1524. - format 0x50
  1525. - format 0x55
  1526. - format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
  1527. - format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
  1528. - driver libmad
  1529. - dll "libmad"
  1530. - flags seekable
  1531. -
  1532. -
  1533. -audiocodec mp3acm
  1534. - info "MPEG layer-3"
  1535. - status working
  1536. - comment "conflicts with security kernel patches"
  1537. - format 0x55
  1538. - driver acm
  1539. - dll "l3codeca.acm"
  1540. - flags seekable
  1541. -
  1542. -audiocodec imaadpcmacm
  1543. - info "IMA ADPCM"
  1544. - status working
  1545. - format 0x11
  1546. - driver acm
  1547. - dll "imaadp32.acm"
  1548. -
  1549. -audiocodec msgsmacm
  1550. - info "MS GSM"
  1551. - status working
  1552. - format 0x31
  1553. -; format 0x32
  1554. - driver acm
  1555. - dll "msgsm32.acm"
  1556. -
  1557. -audiocodec msnaudio
  1558. - info "MSN AUDIO"
  1559. - status working
  1560. -; format 0x31
  1561. - format 0x32
  1562. - driver acm
  1563. - dll "msnaudio.acm"
  1564. -
  1565. -audiocodec msgsm
  1566. - info "MS GSM"
  1567. - status working
  1568. - format 0x31
  1569. - format 0x32
  1570. - fourcc agsm
  1571. - driver msgsm
  1572. -
  1573. audiocodec alaw
  1574. info "aLaw"
  1575. status working
  1576. @@ -1601,113 +322,3 @@
  1577. format 0x2000
  1578. driver liba52
  1579. dll "liba52"
  1580. -
  1581. -audiocodec ac3
  1582. - info "AC3-libac3"
  1583. - comment "removed from mplayer, use liba52"
  1584. - status working
  1585. - format 0x2000
  1586. - driver libac3
  1587. - dll "libac3"
  1588. -
  1589. -audiocodec voxware
  1590. - info "VoxWare"
  1591. - status working
  1592. - format 0x75
  1593. - driver dshow
  1594. - dll "voxmsdec.ax"
  1595. - guid 0x73f7a062, 0x8829, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d
  1596. -
  1597. -audiocodec acelp
  1598. - info "ACELP.net Sipro Lab Audio Decoder"
  1599. - status working
  1600. - format 0x130
  1601. - driver dshow
  1602. - dll "acelpdec.ax"
  1603. - guid 0x4009f700, 0xaeba, 0x11d1, 0x83, 0x44, 0x00, 0xc0, 0x4f, 0xb9, 0x2e, 0xb7
  1604. -
  1605. -audiocodec imc
  1606. - info "Intel Music Coder"
  1607. - status working
  1608. - comment "driver at http://codeczone.virtualave.net/FXIMCAUD.zip"
  1609. - format 0x401
  1610. - driver acm
  1611. - dll "imc32.acm"
  1612. -
  1613. -audiocodec hwac3
  1614. - info "AC3 through SPDIF"
  1615. - status working
  1616. - format 0x2000
  1617. - driver hwac3
  1618. -
  1619. -audiocodec vorbis
  1620. - info "OggVorbis Audio Decoder"
  1621. - status working
  1622. - comment "OggVorbis driver using libvorbis"
  1623. - format 0xFFFE
  1624. - driver libvorbis
  1625. - dll "libvorbis"
  1626. - flags seekable
  1627. -; acm codec doesn't work, haven't tried zorannt dshow codec
  1628. -; driver acm
  1629. -; dll "vorbis.acm"
  1630. -
  1631. -audiocodec vivoaudio
  1632. - info "Vivo G.723/Siren Audio Codec"
  1633. - status working
  1634. - format 0x111 ; vivo g.723
  1635. - format 0x112 ; siren
  1636. - driver acm
  1637. - dll "vivog723.acm"
  1638. -
  1639. -audiocodec g72x
  1640. - info "G.711/G.721/G.723"
  1641. - status crashing
  1642. - comment "does not work yet - just noise :("
  1643. - format 0x111 ; vivo g.723
  1644. - format 0x112 ; vivo siren
  1645. - driver g72x
  1646. - dll "g72x.c"
  1647. -
  1648. -audiocodec atrac3
  1649. - info "Sony ATRAC3"
  1650. - status buggy
  1651. - comment "format not accepted"
  1652. - format 0x270
  1653. - driver acm
  1654. - dll "atrac3.acm"
  1655. -
  1656. -audiocodec ALF2
  1657. -; http://www.nctsoft.com/products/NCTALFCD/
  1658. -; jdp@mail.sonofon.dk
  1659. - info "ALF2"
  1660. - status working
  1661. - format 0x1FC4 ; ALF2
  1662. - driver acm
  1663. - dll "alf2cd.acm"
  1664. -
  1665. -audiocodec truespeech
  1666. - info "DSP Group TrueSpeech(TM)"
  1667. - status working
  1668. - format 0x22
  1669. - driver acm
  1670. - dll "tssoft32.acm"
  1671. -
  1672. -; rt32dcmp.dll needed too
  1673. -audiocodec voxwarert24
  1674. - info "VoxWare RT24 speech codec"
  1675. - status working
  1676. - format 0x181c
  1677. - driver acm
  1678. - dll "nsrt2432.acm"
  1679. -
  1680. -audiocodec lhacm
  1681. - info "Lernout & Hauspie CELP and SBC codecs"
  1682. - status working
  1683. - format 0x1101 ; CELP
  1684. - format 0x1102 ; SBC
  1685. - format 0x1103 ; SBC
  1686. - format 0x1104 ; SBC
  1687. - driver acm
  1688. - dll "lhacm.acm"
  1689. -
  1690. diff -aur MPlayer-0.90rc2.orig/etc/.libdeps MPlayer-0.90rc2/etc/.libdeps
  1691. --- MPlayer-0.90rc2.orig/etc/.libdeps 2002-10-07 22:23:04.000000000 +0800
  1692. +++ MPlayer-0.90rc2/etc/.libdeps 2008-09-06 21:57:20.000000000 +0800
  1693. @@ -17,7 +17,6 @@
  1694. libvo/libvo.a: $(wildcard libvo/*.[ch])
  1695. libao2/libao2.a: $(wildcard libao2/*.[ch])
  1696. liba52/liba52.a: $(wildcard liba52/*.[ch])
  1697. -mp3lib/libMP3.a: $(wildcard mp3lib/*.[ch])
  1698. libdha/libdha.so: $(wildcard libdha/*.[ch])
  1699. vidix/libvidix.a: $(wildcard vidix/*.[ch])
  1700. Gui/libgui.a: $(wildcard Gui/*.[ch])
  1701. diff -aur MPlayer-0.90rc2.orig/help/help_mp-en.h MPlayer-0.90rc2/help/help_mp-en.h
  1702. --- MPlayer-0.90rc2.orig/help/help_mp-en.h 2002-12-16 07:45:37.000000000 +0800
  1703. +++ MPlayer-0.90rc2/help/help_mp-en.h 2008-09-06 21:59:21.000000000 +0800
  1704. @@ -31,26 +31,12 @@
  1705. " -nosound don't play sound\n"
  1706. " -fs -vm -zoom fullscreen playing options (fullscr,vidmode chg,softw.scale)\n"
  1707. " -x <x> -y <y> set display resolution (for use with -vm or -zoom)\n"
  1708. -" -sub <file> specify subtitle file to use (see also -subfps, -subdelay)\n"
  1709. " -playlist <file> specify playlist file\n"
  1710. " -vid x -aid y options to select video (x) and audio (y) stream to play\n"
  1711. " -fps x -srate y options to change video (x fps) and audio (y Hz) rate\n"
  1712. " -pp <quality> enable postprocessing filter (see the man page for details)\n"
  1713. " -framedrop enable frame dropping (for slow machines)\n"
  1714. "\n"
  1715. -"Basic keys: (see the man page for the complete list, also check input.conf)\n"
  1716. -" <- or -> seek backward/forward 10 seconds\n"
  1717. -" up or down seek backward/forward 1 minute\n"
  1718. -" pgup or pgdown seek backward/forward 10 minutes\n"
  1719. -" < or > step backward/forward in playlist\n"
  1720. -" p or SPACE pause movie (press any key to continue)\n"
  1721. -" q or ESC stop playing and quit program\n"
  1722. -" + or - adjust audio delay by +/- 0.1 second\n"
  1723. -" o cycle OSD mode: none / seekbar / seekbar+timer\n"
  1724. -" * or / increase or decrease pcm volume\n"
  1725. -" z or x adjust subtitle delay by +/- 0.1 second\n"
  1726. -" r or t adjust subtitle position up/down, also see -vop expand\n"
  1727. -"\n"
  1728. " * * * SEE MAN PAGE FOR DETAILS, FURTHER (ADVANCED) OPTIONS AND KEYS! * * *\n"
  1729. "\n";
  1730. #endif
  1731. @@ -97,9 +83,6 @@
  1732. " **** Your system is too SLOW to play this! ****\n"\
  1733. " ************************************************\n"\
  1734. "!!! Possible reasons, problems, workarounds: \n"\
  1735. -"- Most common: broken/buggy _audio_ driver. Workaround: Try -ao sdl or use\n"\
  1736. -" ALSA 0.5 or OSS emulation of ALSA 0.9. Read DOCS/sound.html for more tips!\n"\
  1737. -" You can also experiment with -autosync 30 or other values.\n"\
  1738. "- Slow video output. Try a different -vo driver (for list: -vo help) or try\n"\
  1739. " with -framedrop! Read DOCS/video.html for video tuning/speedup tips.\n"\
  1740. "- Slow CPU. Don't try to play a big DVD/divx on a slow CPU! Try -hardframedrop.\n"\
  1741. diff -aur MPlayer-0.90rc2.orig/libaf/af.c MPlayer-0.90rc2/libaf/af.c
  1742. --- MPlayer-0.90rc2.orig/libaf/af.c 2002-11-12 20:33:54.000000000 +0800
  1743. +++ MPlayer-0.90rc2/libaf/af.c 2008-09-06 21:57:20.000000000 +0800
  1744. @@ -15,7 +15,6 @@
  1745. extern af_info_t af_info_format;
  1746. extern af_info_t af_info_resample;
  1747. extern af_info_t af_info_volume;
  1748. -extern af_info_t af_info_equalizer;
  1749.  
  1750. static af_info_t* filter_list[]={ \
  1751. &af_info_dummy,\
  1752. @@ -24,7 +23,6 @@
  1753. &af_info_format,\
  1754. &af_info_resample,\
  1755. &af_info_volume,\
  1756. - &af_info_equalizer,\
  1757. NULL \
  1758. };
  1759.  
  1760. diff -aur MPlayer-0.90rc2.orig/libaf/Makefile MPlayer-0.90rc2/libaf/Makefile
  1761. --- MPlayer-0.90rc2.orig/libaf/Makefile 2002-11-25 10:19:27.000000000 +0800
  1762. +++ MPlayer-0.90rc2/libaf/Makefile 2008-09-06 21:57:20.000000000 +0800
  1763. @@ -2,7 +2,7 @@
  1764.  
  1765. LIBNAME = libaf.a
  1766.  
  1767. -SRCS=af.c af_mp.c af_dummy.c af_delay.c af_channels.c af_format.c af_resample.c window.c filter.c af_volume.c af_equalizer.c
  1768. +SRCS=af.c af_mp.c af_dummy.c af_delay.c af_channels.c af_format.c af_resample.c window.c filter.c af_volume.c
  1769.  
  1770. OBJS=$(SRCS:.c=.o)
  1771.  
  1772. diff -aur MPlayer-0.90rc2.orig/libao2/audio_out.c MPlayer-0.90rc2/libao2/audio_out.c
  1773. --- MPlayer-0.90rc2.orig/libao2/audio_out.c 2002-12-23 00:31:02.000000000 +0800
  1774. +++ MPlayer-0.90rc2/libao2/audio_out.c 2008-09-06 21:57:20.000000000 +0800
  1775. @@ -44,15 +44,12 @@
  1776. #ifdef HAVE_DXR2
  1777. extern ao_functions_t audio_out_dxr2;
  1778. #endif
  1779. -extern ao_functions_t audio_out_mpegpes;
  1780. extern ao_functions_t audio_out_pcm;
  1781. extern ao_functions_t audio_out_pss;
  1782. extern ao_functions_t audio_out_plugin;
  1783.  
  1784. ao_functions_t* audio_out_drivers[] =
  1785. {
  1786. -// vo-related: will fail unless you also do -vo mpegpes/dxr2
  1787. - &audio_out_mpegpes,
  1788. #ifdef HAVE_DXR2
  1789. &audio_out_dxr2,
  1790. #endif
  1791. diff -aur MPlayer-0.90rc2.orig/libao2/audio_plugin.h MPlayer-0.90rc2/libao2/audio_plugin.h
  1792. --- MPlayer-0.90rc2.orig/libao2/audio_plugin.h 2002-07-26 04:28:47.000000000 +0800
  1793. +++ MPlayer-0.90rc2/libao2/audio_plugin.h 2008-09-06 21:57:20.000000000 +0800
  1794. @@ -60,22 +60,14 @@
  1795. // List of plugins
  1796. extern ao_plugin_functions_t audio_plugin_delay;
  1797. extern ao_plugin_functions_t audio_plugin_format;
  1798. -extern ao_plugin_functions_t audio_plugin_surround;
  1799. extern ao_plugin_functions_t audio_plugin_resample;
  1800. extern ao_plugin_functions_t audio_plugin_volume;
  1801. -extern ao_plugin_functions_t audio_plugin_extrastereo;
  1802. -extern ao_plugin_functions_t audio_plugin_volnorm;
  1803. -extern ao_plugin_functions_t audio_plugin_eq;
  1804.  
  1805. #define AO_PLUGINS { \
  1806. &audio_plugin_delay, \
  1807. &audio_plugin_format, \
  1808. - &audio_plugin_surround, \
  1809. &audio_plugin_resample, \
  1810. &audio_plugin_volume, \
  1811. - &audio_plugin_extrastereo, \
  1812. - &audio_plugin_volnorm, \
  1813. - &audio_plugin_eq, \
  1814. NULL \
  1815. }
  1816. #endif /* PLUGIN */
  1817. diff -aur MPlayer-0.90rc2.orig/libao2/Makefile MPlayer-0.90rc2/libao2/Makefile
  1818. --- MPlayer-0.90rc2.orig/libao2/Makefile 2002-06-15 14:15:07.000000000 +0800
  1819. +++ MPlayer-0.90rc2/libao2/Makefile 2008-09-06 21:57:20.000000000 +0800
  1820. @@ -4,7 +4,7 @@
  1821. LIBNAME = libao2.a
  1822.  
  1823. # TODO: moveout ao_sdl.c so it's only used when SDL is detected
  1824. -SRCS=afmt.c audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_surround.c remez.c pl_resample.c pl_volume.c pl_extrastereo.c pl_volnorm.c pl_eq.c $(OPTIONAL_SRCS)
  1825. +SRCS=afmt.c audio_out.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_resample.c pl_volume.c $(OPTIONAL_SRCS)
  1826.  
  1827. OBJS=$(SRCS:.c=.o)
  1828.  
  1829. diff -aur MPlayer-0.90rc2.orig/libavcodec/allcodecs.c MPlayer-0.90rc2/libavcodec/allcodecs.c
  1830. --- MPlayer-0.90rc2.orig/libavcodec/allcodecs.c 2002-12-25 02:44:59.000000000 +0800
  1831. +++ MPlayer-0.90rc2/libavcodec/allcodecs.c 2008-09-06 21:57:20.000000000 +0800
  1832. @@ -35,7 +35,6 @@
  1833. /* encoders */
  1834. #ifdef CONFIG_ENCODERS
  1835. register_avcodec(&ac3_encoder);
  1836. - register_avcodec(&mp2_encoder);
  1837. #ifdef CONFIG_MP3LAME
  1838. register_avcodec(&mp3lame_encoder);
  1839. #endif
  1840. @@ -46,15 +45,12 @@
  1841. register_avcodec(&mpeg1video_encoder);
  1842. register_avcodec(&h263_encoder);
  1843. register_avcodec(&h263p_encoder);
  1844. - register_avcodec(&rv10_encoder);
  1845. - register_avcodec(&mjpeg_encoder);
  1846. register_avcodec(&mpeg4_encoder);
  1847. register_avcodec(&msmpeg4v1_encoder);
  1848. register_avcodec(&msmpeg4v2_encoder);
  1849. register_avcodec(&msmpeg4v3_encoder);
  1850. register_avcodec(&wmv1_encoder);
  1851. // register_avcodec(&wmv2_encoder);
  1852. - register_avcodec(&huffyuv_encoder);
  1853. #endif /* CONFIG_ENCODERS */
  1854. register_avcodec(&rawvideo_codec);
  1855.  
  1856. @@ -69,19 +65,6 @@
  1857. // register_avcodec(&wmv2_decoder);
  1858. register_avcodec(&mpeg_decoder);
  1859. register_avcodec(&h263i_decoder);
  1860. - register_avcodec(&rv10_decoder);
  1861. - register_avcodec(&svq1_decoder);
  1862. - register_avcodec(&dvvideo_decoder);
  1863. - // register_avcodec(&dvaudio_decoder);
  1864. - register_avcodec(&mjpeg_decoder);
  1865. - register_avcodec(&mjpegb_decoder);
  1866. - register_avcodec(&mp2_decoder);
  1867. - register_avcodec(&mp3_decoder);
  1868. - register_avcodec(&wmav1_decoder);
  1869. - register_avcodec(&wmav2_decoder);
  1870. - register_avcodec(&mace3_decoder);
  1871. - register_avcodec(&mace6_decoder);
  1872. - register_avcodec(&huffyuv_decoder);
  1873. #ifdef CONFIG_AC3
  1874. register_avcodec(&ac3_decoder);
  1875. #endif
  1876. diff -aur MPlayer-0.90rc2.orig/libavcodec/avcodec.c MPlayer-0.90rc2/libavcodec/avcodec.c
  1877. --- MPlayer-0.90rc2.orig/libavcodec/avcodec.c 2002-12-08 06:56:12.000000000 +0800
  1878. +++ MPlayer-0.90rc2/libavcodec/avcodec.c 2008-09-06 21:57:20.000000000 +0800
  1879. @@ -30,7 +30,6 @@
  1880. { CODEC_ID_MSMPEG4V3, { MKTAG('D', 'I', 'V', '3'), 0 } },
  1881. { CODEC_ID_MPEG4, { MKTAG('D', 'I', 'V', 'X'), MKTAG('D', 'X', '5', '0'), 0 } },
  1882. { CODEC_ID_MSMPEG4V2, { MKTAG('M', 'P', '4', '2'), 0 } },
  1883. - { CODEC_ID_MJPEG, { MKTAG('M', 'J', 'P', 'G'), 0 } },
  1884. { CODEC_ID_MPEG1VIDEO, { MKTAG('P', 'I', 'M', '1'), 0 } },
  1885. { CODEC_ID_AC3, { 0x2000, 0 } },
  1886. { CODEC_ID_MP2, { 0x50, 0x55, 0 } },
  1887. diff -aur MPlayer-0.90rc2.orig/libavcodec/avcodec.h MPlayer-0.90rc2/libavcodec/avcodec.h
  1888. --- MPlayer-0.90rc2.orig/libavcodec/avcodec.h 2002-12-25 02:44:59.000000000 +0800
  1889. +++ MPlayer-0.90rc2/libavcodec/avcodec.h 2008-09-06 21:57:20.000000000 +0800
  1890. @@ -12,13 +12,9 @@
  1891. CODEC_ID_NONE,
  1892. CODEC_ID_MPEG1VIDEO,
  1893. CODEC_ID_H263,
  1894. - CODEC_ID_RV10,
  1895. - CODEC_ID_MP2,
  1896. CODEC_ID_MP3LAME,
  1897. CODEC_ID_VORBIS,
  1898. CODEC_ID_AC3,
  1899. - CODEC_ID_MJPEG,
  1900. - CODEC_ID_MJPEGB,
  1901. CODEC_ID_MPEG4,
  1902. CODEC_ID_RAWVIDEO,
  1903. CODEC_ID_MSMPEG4V1,
  1904. @@ -28,14 +24,6 @@
  1905. CODEC_ID_WMV2,
  1906. CODEC_ID_H263P,
  1907. CODEC_ID_H263I,
  1908. - CODEC_ID_SVQ1,
  1909. - CODEC_ID_DVVIDEO,
  1910. - CODEC_ID_DVAUDIO,
  1911. - CODEC_ID_WMAV1,
  1912. - CODEC_ID_WMAV2,
  1913. - CODEC_ID_MACE3,
  1914. - CODEC_ID_MACE6,
  1915. - CODEC_ID_HUFFYUV,
  1916.  
  1917. /* various pcm "codecs" */
  1918. CODEC_ID_PCM_S16LE,
  1919. @@ -322,8 +310,6 @@
  1920.  
  1921. /**
  1922. * some codecs need / can use extra-data like huffman tables
  1923. - * mjpeg: huffman tables
  1924. - * rv10: additional flags
  1925. * mpeg4: global headers (they can be in the bitstream or here)
  1926. * encoding: set/allocated/freed by lavc.
  1927. * decoding: set/allocated/freed by user.
  1928. @@ -785,14 +771,14 @@
  1929. unsigned dsp_mask;
  1930.  
  1931. /**
  1932. - * bits per sample/pixel from the demuxer (needed for huffyuv)
  1933. + * bits per sample/pixel from the demuxer
  1934. * encoding: set by lavc
  1935. * decoding: set by user
  1936. */
  1937. int bits_per_sample;
  1938.  
  1939. /**
  1940. - * prediction method (needed for huffyuv)
  1941. + * prediction method
  1942. * encoding: set by user
  1943. * decoding: unused
  1944. */
  1945. @@ -876,21 +862,17 @@
  1946. } AVPicture;
  1947.  
  1948. extern AVCodec ac3_encoder;
  1949. -extern AVCodec mp2_encoder;
  1950. extern AVCodec mp3lame_encoder;
  1951. extern AVCodec oggvorbis_encoder;
  1952. extern AVCodec mpeg1video_encoder;
  1953. extern AVCodec h263_encoder;
  1954. extern AVCodec h263p_encoder;
  1955. -extern AVCodec rv10_encoder;
  1956. -extern AVCodec mjpeg_encoder;
  1957. extern AVCodec mpeg4_encoder;
  1958. extern AVCodec msmpeg4v1_encoder;
  1959. extern AVCodec msmpeg4v2_encoder;
  1960. extern AVCodec msmpeg4v3_encoder;
  1961. extern AVCodec wmv1_encoder;
  1962. extern AVCodec wmv2_encoder;
  1963. -extern AVCodec huffyuv_encoder;
  1964.  
  1965. extern AVCodec h263_decoder;
  1966. extern AVCodec mpeg4_decoder;
  1967. @@ -901,19 +883,6 @@
  1968. extern AVCodec wmv2_decoder;
  1969. extern AVCodec mpeg_decoder;
  1970. extern AVCodec h263i_decoder;
  1971. -extern AVCodec rv10_decoder;
  1972. -extern AVCodec svq1_decoder;
  1973. -extern AVCodec dvvideo_decoder;
  1974. -extern AVCodec dvaudio_decoder;
  1975. -extern AVCodec wmav1_decoder;
  1976. -extern AVCodec wmav2_decoder;
  1977. -extern AVCodec mjpeg_decoder;
  1978. -extern AVCodec mjpegb_decoder;
  1979. -extern AVCodec mp2_decoder;
  1980. -extern AVCodec mp3_decoder;
  1981. -extern AVCodec mace3_decoder;
  1982. -extern AVCodec mace6_decoder;
  1983. -extern AVCodec huffyuv_decoder;
  1984. extern AVCodec oggvorbis_decoder;
  1985.  
  1986. /* pcm codecs */
  1987. diff -aur MPlayer-0.90rc2.orig/libavcodec/dsputil.h MPlayer-0.90rc2/libavcodec/dsputil.h
  1988. --- MPlayer-0.90rc2.orig/libavcodec/dsputil.h 2002-12-08 06:56:13.000000000 +0800
  1989. +++ MPlayer-0.90rc2/libavcodec/dsputil.h 2008-09-06 21:57:20.000000000 +0800
  1990. @@ -119,7 +119,6 @@
  1991. op_pixels_abs_func pix_abs8x8_y2;
  1992. op_pixels_abs_func pix_abs8x8_xy2;
  1993.  
  1994. - /* huffyuv specific */
  1995. //FIXME note: alignment isnt guranteed currently but could be if needed
  1996. void (*add_bytes)(uint8_t *dst/*align 16*/, uint8_t *src/*align 16*/, int w);
  1997. void (*diff_bytes)(uint8_t *dst/*align 16*/, uint8_t *src1/*align 16*/, uint8_t *src2/*align 16*/,int w);
  1998. diff -aur MPlayer-0.90rc2.orig/libavcodec/h263.c MPlayer-0.90rc2/libavcodec/h263.c
  1999. --- MPlayer-0.90rc2.orig/libavcodec/h263.c 2002-12-25 02:44:59.000000000 +0800
  2000. +++ MPlayer-0.90rc2/libavcodec/h263.c 2008-09-06 21:57:20.000000000 +0800
  2001. @@ -3402,25 +3402,9 @@
  2002. }
  2003. } else if (s->mb_intra) {
  2004. /* DC coef */
  2005. - if (s->h263_rv10 && s->rv10_version == 3 && s->pict_type == I_TYPE) {
  2006. - int component, diff;
  2007. - component = (n <= 3 ? 0 : n - 4 + 1);
  2008. - level = s->last_dc[component];
  2009. - if (s->rv10_first_dc_coded[component]) {
  2010. - diff = rv_decode_dc(s, n);
  2011. - if (diff == 0xffff)
  2012. - return -1;
  2013. - level += diff;
  2014. - level = level & 0xff; /* handle wrap round */
  2015. - s->last_dc[component] = level;
  2016. - } else {
  2017. - s->rv10_first_dc_coded[component] = 1;
  2018. - }
  2019. - } else {
  2020. - level = get_bits(&s->gb, 8);
  2021. - if (level == 255)
  2022. - level = 128;
  2023. - }
  2024. + level = get_bits(&s->gb, 8);
  2025. + if (level == 255)
  2026. + level = 128;
  2027. block[0] = level;
  2028. i = 1;
  2029. } else {
  2030. @@ -3444,11 +3428,6 @@
  2031. last = get_bits1(&s->gb);
  2032. run = get_bits(&s->gb, 6);
  2033. level = (INT8)get_bits(&s->gb, 8);
  2034. - if (s->h263_rv10 && level == -128) {
  2035. - /* XXX: should patch encoder too */
  2036. - level = get_bits(&s->gb, 12);
  2037. - level= (level + ((-1)<<11)) ^ ((-1)<<11); //sign extension
  2038. - }
  2039. } else {
  2040. run = rl->table_run[code];
  2041. level = rl->table_level[code];
  2042. diff -aur MPlayer-0.90rc2.orig/libavcodec/Makefile MPlayer-0.90rc2/libavcodec/Makefile
  2043. --- MPlayer-0.90rc2.orig/libavcodec/Makefile 2002-12-08 06:56:12.000000000 +0800
  2044. +++ MPlayer-0.90rc2/libavcodec/Makefile 2008-09-06 21:57:20.000000000 +0800
  2045. @@ -7,16 +7,16 @@
  2046. VPATH=$(SRC_PATH)/libavcodec
  2047.  
  2048. # NOTE: -I.. is needed to include config.h
  2049. -CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
  2050. +CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_GNU_SOURCE
  2051. LDFLAGS= -g
  2052.  
  2053. OBJS= common.o utils.o mem.o allcodecs.o \
  2054. - mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
  2055. - mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
  2056. + mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o \
  2057. + resample.o dsputil.o \
  2058. motion_est.o imgconvert.o imgresample.o msmpeg4.o \
  2059. - mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \
  2060. - ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
  2061. - wmadec.o fft.o mdct.o mace.o huffyuv.o
  2062. + mpeg12.o h263dec.o pcm.o simple_idct.o \
  2063. + ratecontrol.o adpcm.o eval.o error_resilience.o \
  2064. + fft.o mdct.o
  2065. ASM_OBJS=
  2066.  
  2067. # currently using liba52 for ac3 decoding
  2068. diff -aur MPlayer-0.90rc2.orig/libavcodec/mpegvideo.c MPlayer-0.90rc2/libavcodec/mpegvideo.c
  2069. --- MPlayer-0.90rc2.orig/libavcodec/mpegvideo.c 2002-12-25 02:44:59.000000000 +0800
  2070. +++ MPlayer-0.90rc2/libavcodec/mpegvideo.c 2008-09-06 21:57:20.000000000 +0800
  2071. @@ -599,22 +599,6 @@
  2072. s->out_format = FMT_MPEG1;
  2073. avctx->delay=0; //FIXME not sure, should check the spec
  2074. break;
  2075. - case CODEC_ID_MJPEG:
  2076. - s->out_format = FMT_MJPEG;
  2077. - s->intra_only = 1; /* force intra only for jpeg */
  2078. - s->mjpeg_write_tables = 1; /* write all tables */
  2079. - s->mjpeg_data_only_frames = 0; /* write all the needed headers */
  2080. - s->mjpeg_vsample[0] = 2; /* set up default sampling factors */
  2081. - s->mjpeg_vsample[1] = 1; /* the only currently supported values */
  2082. - s->mjpeg_vsample[2] = 1;
  2083. - s->mjpeg_hsample[0] = 2;
  2084. - s->mjpeg_hsample[1] = 1;
  2085. - s->mjpeg_hsample[2] = 1;
  2086. - if (mjpeg_init(s) < 0)
  2087. - return -1;
  2088. - avctx->delay=0;
  2089. - s->low_delay=1;
  2090. - break;
  2091. case CODEC_ID_H263:
  2092. if (h263_get_picture_format(s->width, s->height) == 7) {
  2093. printf("Input picture size isn't suitable for h263 codec! try h263+\n");
  2094. @@ -636,12 +620,6 @@
  2095. avctx->delay=0;
  2096. s->low_delay=1;
  2097. break;
  2098. - case CODEC_ID_RV10:
  2099. - s->out_format = FMT_H263;
  2100. - s->h263_rv10 = 1;
  2101. - avctx->delay=0;
  2102. - s->low_delay=1;
  2103. - break;
  2104. case CODEC_ID_MPEG4:
  2105. s->out_format = FMT_H263;
  2106. s->h263_pred = 1;
  2107. @@ -752,13 +730,6 @@
  2108. }
  2109.  
  2110. /* precompute matrix */
  2111. - /* for mjpeg, we do include qscale in the matrix */
  2112. - if (s->out_format != FMT_MJPEG) {
  2113. - convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias,
  2114. - s->intra_matrix, s->intra_quant_bias, 1, 31);
  2115. - convert_matrix(s, s->q_inter_matrix, s->q_inter_matrix16, s->q_inter_matrix16_bias,
  2116. - s->inter_matrix, s->inter_quant_bias, 1, 31);
  2117. - }
  2118.  
  2119. if(ff_rate_control_init(s) < 0)
  2120. return -1;
  2121. @@ -784,8 +755,6 @@
  2122. ff_rate_control_uninit(s);
  2123.  
  2124. MPV_common_end(s);
  2125. - if (s->out_format == FMT_MJPEG)
  2126. - mjpeg_close(s);
  2127.  
  2128. return 0;
  2129. }
  2130. @@ -914,14 +883,6 @@
  2131. void MPV_frame_end(MpegEncContext *s)
  2132. {
  2133. int i;
  2134. - /* draw edge for correct motion prediction if outside */
  2135. - if(s->codec_id!=CODEC_ID_SVQ1){
  2136. - if (s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
  2137. - draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH );
  2138. - draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
  2139. - draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
  2140. - }
  2141. - }
  2142. emms_c();
  2143.  
  2144. s->last_pict_type = s->pict_type;
  2145. @@ -1230,9 +1191,6 @@
  2146.  
  2147. MPV_frame_end(s);
  2148.  
  2149. - if (s->out_format == FMT_MJPEG)
  2150. - mjpeg_picture_trailer(s);
  2151. -
  2152. if(s->flags&CODEC_FLAG_PASS1)
  2153. ff_write_pass1_stats(s);
  2154. }
  2155. @@ -2539,13 +2497,6 @@
  2156. }
  2157. #endif
  2158. /* DCT & quantize */
  2159. - if(s->out_format==FMT_MJPEG){
  2160. - for(i=0;i<6;i++) {
  2161. - int overflow;
  2162. - s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, 8, &overflow);
  2163. - if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]);
  2164. - }
  2165. - }else{
  2166. for(i=0;i<6;i++) {
  2167. if(!skip_dct[i]){
  2168. int overflow;
  2169. @@ -2563,7 +2514,6 @@
  2170. if(s->chroma_elim_threshold && !s->mb_intra)
  2171. for(i=4; i<6; i++)
  2172. dct_single_coeff_elimination(s, i, s->chroma_elim_threshold);
  2173. - }
  2174.  
  2175. if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){
  2176. s->block_last_index[4]=
  2177. @@ -2586,9 +2536,6 @@
  2178. else
  2179. h263_encode_mb(s, s->block, motion_x, motion_y);
  2180. break;
  2181. - case FMT_MJPEG:
  2182. - mjpeg_encode_mb(s, s->block);
  2183. - break;
  2184. }
  2185. #endif
  2186. }
  2187. @@ -2842,18 +2789,6 @@
  2188. }else
  2189. s->qscale= (int)(s->frame_qscale + 0.5);
  2190.  
  2191. - if (s->out_format == FMT_MJPEG) {
  2192. - /* for mjpeg, we do include qscale in the matrix */
  2193. - s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
  2194. - for(i=1;i<64;i++){
  2195. - int j= s->idct_permutation[i];
  2196. -
  2197. - s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
  2198. - }
  2199. - convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16,
  2200. - s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias, 8, 8);
  2201. - }
  2202. -
  2203. //FIXME var duplication
  2204. s->current_picture.key_frame= s->pict_type == I_TYPE;
  2205. s->current_picture.pict_type= s->pict_type;
  2206. @@ -2863,16 +2798,11 @@
  2207.  
  2208. s->last_bits= get_bit_count(&s->pb);
  2209. switch(s->out_format) {
  2210. - case FMT_MJPEG:
  2211. - mjpeg_picture_header(s);
  2212. - break;
  2213. case FMT_H263:
  2214. if (s->h263_msmpeg4)
  2215. msmpeg4_encode_picture_header(s, picture_number);
  2216. else if (s->h263_pred)
  2217. mpeg4_encode_picture_header(s, picture_number);
  2218. - else if (s->h263_rv10)
  2219. - rv10_encode_picture_header(s, picture_number);
  2220. else
  2221. h263_encode_picture_header(s, picture_number);
  2222. break;
  2223. @@ -3504,26 +3434,6 @@
  2224. MPV_encode_end,
  2225. };
  2226.  
  2227. -AVCodec rv10_encoder = {
  2228. - "rv10",
  2229. - CODEC_TYPE_VIDEO,
  2230. - CODEC_ID_RV10,
  2231. - sizeof(MpegEncContext),
  2232. - MPV_encode_init,
  2233. - MPV_encode_picture,
  2234. - MPV_encode_end,
  2235. -};
  2236. -
  2237. -AVCodec mjpeg_encoder = {
  2238. - "mjpeg",
  2239. - CODEC_TYPE_VIDEO,
  2240. - CODEC_ID_MJPEG,
  2241. - sizeof(MpegEncContext),
  2242. - MPV_encode_init,
  2243. - MPV_encode_picture,
  2244. - MPV_encode_end,
  2245. -};
  2246. -
  2247. AVCodec mpeg4_encoder = {
  2248. "mpeg4",
  2249. CODEC_TYPE_VIDEO,
  2250. diff -aur MPlayer-0.90rc2.orig/libavcodec/mpegvideo.h MPlayer-0.90rc2/libavcodec/mpegvideo.h
  2251. --- MPlayer-0.90rc2.orig/libavcodec/mpegvideo.h 2002-12-25 02:44:59.000000000 +0800
  2252. +++ MPlayer-0.90rc2/libavcodec/mpegvideo.h 2008-09-06 21:57:20.000000000 +0800
  2253. @@ -25,7 +25,6 @@
  2254. enum OutputFormat {
  2255. FMT_MPEG1,
  2256. FMT_H263,
  2257. - FMT_MJPEG,
  2258. };
  2259.  
  2260. #define EDGE_WIDTH 16
  2261. @@ -143,7 +142,6 @@
  2262.  
  2263. /* the following codec id fields are deprecated in favor of codec_id */
  2264. int h263_plus; /* h263 plus headers */
  2265. - int h263_rv10; /* use RV10 variation for H263 */
  2266. int h263_msmpeg4; /* generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)*/
  2267. int h263_intel; /* use I263 intel h263 header */
  2268.  
  2269. @@ -430,18 +428,6 @@
  2270. int ffmpeg_version;
  2271. int lavc_build;
  2272.  
  2273. - /* RV10 specific */
  2274. - int rv10_version; /* RV10 version: 0 or 3 */
  2275. - int rv10_first_dc_coded[3];
  2276. -
  2277. - /* MJPEG specific */
  2278. - struct MJpegContext *mjpeg_ctx;
  2279. - int mjpeg_vsample[3]; /* vertical sampling factors, default = {2, 1, 1} */
  2280. - int mjpeg_hsample[3]; /* horizontal sampling factors, default = {2, 1, 1} */
  2281. - int mjpeg_write_tables; /* do we want to have quantisation- and
  2282. - huffmantables in the jpeg file ? */
  2283. - int mjpeg_data_only_frames; /* frames only with SOI, SOS and EOI markers */
  2284. -
  2285. /* MSMPEG4 specific */
  2286. int mv_table_index;
  2287. int rl_table_index;
  2288. @@ -669,11 +655,6 @@
  2289. int ff_h263_get_gob_height(MpegEncContext *s);
  2290.  
  2291.  
  2292. -/* rv10.c */
  2293. -void rv10_encode_picture_header(MpegEncContext *s, int picture_number);
  2294. -int rv_decode_dc(MpegEncContext *s, int n);
  2295. -
  2296. -
  2297. /* msmpeg4.c */
  2298. void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number);
  2299. void msmpeg4_encode_ext_header(MpegEncContext * s);
  2300. @@ -686,15 +667,6 @@
  2301. void ff_msmpeg4_encode_init(MpegEncContext *s);
  2302.  
  2303.  
  2304. -/* mjpegenc.c */
  2305. -int mjpeg_init(MpegEncContext *s);
  2306. -void mjpeg_close(MpegEncContext *s);
  2307. -void mjpeg_encode_mb(MpegEncContext *s,
  2308. - DCTELEM block[6][64]);
  2309. -void mjpeg_picture_header(MpegEncContext *s);
  2310. -void mjpeg_picture_trailer(MpegEncContext *s);
  2311. -
  2312. -
  2313. /* rate control */
  2314. int ff_rate_control_init(MpegEncContext *s);
  2315. float ff_rate_estimate_qscale(MpegEncContext *s);
  2316. diff -aur MPlayer-0.90rc2.orig/libavcodec/utils.c MPlayer-0.90rc2/libavcodec/utils.c
  2317. --- MPlayer-0.90rc2.orig/libavcodec/utils.c 2002-12-25 02:44:59.000000000 +0800
  2318. +++ MPlayer-0.90rc2/libavcodec/utils.c 2008-09-06 21:57:20.000000000 +0800
  2319. @@ -160,9 +160,7 @@
  2320. pixel_size=1;
  2321. }
  2322.  
  2323. - if(s->codec_id==CODEC_ID_SVQ1) align=63;
  2324. - else align=15;
  2325. -
  2326. + align=15;
  2327. w= (width +align)&~align;
  2328. h= (height+align)&~align;
  2329.  
  2330. @@ -660,9 +658,6 @@
  2331. switch(avctx->codec_id){
  2332. case CODEC_ID_MPEG1VIDEO:
  2333. case CODEC_ID_H263:
  2334. - case CODEC_ID_RV10:
  2335. - case CODEC_ID_MJPEG:
  2336. - case CODEC_ID_MJPEGB:
  2337. case CODEC_ID_MPEG4:
  2338. case CODEC_ID_MSMPEG4V1:
  2339. case CODEC_ID_MSMPEG4V2:
  2340. @@ -671,13 +666,6 @@
  2341. case CODEC_ID_WMV2:
  2342. case CODEC_ID_H263P:
  2343. case CODEC_ID_H263I:
  2344. - case CODEC_ID_SVQ1:
  2345. - for(i=0; i<MAX_PICTURE_COUNT; i++){
  2346. - if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL
  2347. - || s->picture[i].type == FF_BUFFER_TYPE_USER))
  2348. - avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
  2349. - }
  2350. - break;
  2351. default:
  2352. //FIXME
  2353. break;
  2354. diff -aur MPlayer-0.90rc2.orig/libmpcodecs/ad.c MPlayer-0.90rc2/libmpcodecs/ad.c
  2355. --- MPlayer-0.90rc2.orig/libmpcodecs/ad.c 2002-12-02 00:40:05.000000000 +0800
  2356. +++ MPlayer-0.90rc2/libmpcodecs/ad.c 2008-09-06 21:57:20.000000000 +0800
  2357. @@ -16,38 +16,22 @@
  2358. /* Missed vorbis, mad, dshow */
  2359.  
  2360. //extern ad_functions_t mpcodecs_ad_null;
  2361. -extern ad_functions_t mpcodecs_ad_mp3lib;
  2362. extern ad_functions_t mpcodecs_ad_ffmpeg;
  2363. extern ad_functions_t mpcodecs_ad_liba52;
  2364. -extern ad_functions_t mpcodecs_ad_hwac3;
  2365. extern ad_functions_t mpcodecs_ad_pcm;
  2366. extern ad_functions_t mpcodecs_ad_dvdpcm;
  2367. extern ad_functions_t mpcodecs_ad_alaw;
  2368. extern ad_functions_t mpcodecs_ad_imaadpcm;
  2369. extern ad_functions_t mpcodecs_ad_msadpcm;
  2370. -extern ad_functions_t mpcodecs_ad_dk3adpcm;
  2371. -extern ad_functions_t mpcodecs_ad_dk4adpcm;
  2372. -extern ad_functions_t mpcodecs_ad_roqaudio;
  2373. -extern ad_functions_t mpcodecs_ad_dshow;
  2374. -extern ad_functions_t mpcodecs_ad_dmo;
  2375. -extern ad_functions_t mpcodecs_ad_acm;
  2376. -extern ad_functions_t mpcodecs_ad_msgsm;
  2377. extern ad_functions_t mpcodecs_ad_faad;
  2378. extern ad_functions_t mpcodecs_ad_libvorbis;
  2379. extern ad_functions_t mpcodecs_ad_libmad;
  2380. -extern ad_functions_t mpcodecs_ad_realaud;
  2381. -extern ad_functions_t mpcodecs_ad_libdv;
  2382. -extern ad_functions_t mpcodecs_ad_qtaudio;
  2383.  
  2384. ad_functions_t* mpcodecs_ad_drivers[] =
  2385. {
  2386. // &mpcodecs_ad_null,
  2387. -#ifdef USE_MP3LIB
  2388. - &mpcodecs_ad_mp3lib,
  2389. -#endif
  2390. #ifdef USE_LIBA52
  2391. &mpcodecs_ad_liba52,
  2392. - &mpcodecs_ad_hwac3,
  2393. #endif
  2394. #ifdef USE_LIBAVCODEC
  2395. &mpcodecs_ad_ffmpeg,
  2396. @@ -57,19 +41,6 @@
  2397. &mpcodecs_ad_alaw,
  2398. &mpcodecs_ad_imaadpcm,
  2399. &mpcodecs_ad_msadpcm,
  2400. - &mpcodecs_ad_dk3adpcm,
  2401. - &mpcodecs_ad_roqaudio,
  2402. - &mpcodecs_ad_msgsm,
  2403. -#ifdef USE_WIN32DLL
  2404. -#ifdef USE_DIRECTSHOW
  2405. - &mpcodecs_ad_dshow,
  2406. - &mpcodecs_ad_dmo,
  2407. -#endif
  2408. - &mpcodecs_ad_acm,
  2409. -#endif
  2410. -#ifdef USE_QTX_CODECS
  2411. - &mpcodecs_ad_qtaudio,
  2412. -#endif
  2413. #ifdef HAVE_FAAD
  2414. &mpcodecs_ad_faad,
  2415. #endif
  2416. @@ -79,11 +50,5 @@
  2417. #ifdef USE_LIBMAD
  2418. &mpcodecs_ad_libmad,
  2419. #endif
  2420. -#ifdef USE_REALCODECS
  2421. - &mpcodecs_ad_realaud,
  2422. -#endif
  2423. -#ifdef HAVE_LIBDV095
  2424. - &mpcodecs_ad_libdv,
  2425. -#endif
  2426. NULL
  2427. };
  2428. diff -aur MPlayer-0.90rc2.orig/libmpcodecs/ad.h MPlayer-0.90rc2/libmpcodecs/ad.h
  2429. --- MPlayer-0.90rc2.orig/libmpcodecs/ad.h 2002-03-26 03:53:41.000000000 +0800
  2430. +++ MPlayer-0.90rc2/libmpcodecs/ad.h 2008-09-06 21:57:20.000000000 +0800
  2431. @@ -26,5 +26,5 @@
  2432. #define ADCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */
  2433.  
  2434. // fallback: use hw mixer in libao
  2435. -#define ADCTRL_SET_VOLUME 4 /* set volume (used for mp3lib and liba52) */
  2436. +#define ADCTRL_SET_VOLUME 4 /* set volume (used for liba52) */
  2437.  
  2438. diff -aur MPlayer-0.90rc2.orig/libmpcodecs/ad_libmad.c MPlayer-0.90rc2/libmpcodecs/ad_libmad.c
  2439. --- MPlayer-0.90rc2.orig/libmpcodecs/ad_libmad.c 2002-08-31 05:44:20.000000000 +0800
  2440. +++ MPlayer-0.90rc2/libmpcodecs/ad_libmad.c 2008-09-06 22:00:17.000000000 +0800
  2441. @@ -67,7 +67,6 @@
  2442. int num_bytes =
  2443. (char*)sh->a_in_buffer+sh->a_in_buffer_len - (char*)this->stream.next_frame;
  2444. memmove(sh->a_in_buffer, this->stream.next_frame, num_bytes);
  2445. - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"libmad: %d bytes processed\n",sh->a_in_buffer_len-num_bytes);
  2446. sh->a_in_buffer_len = num_bytes;
  2447. }
  2448. if (ret == 0) return 1; // OK!!!
  2449. @@ -75,7 +74,6 @@
  2450. if(this->stream.error==MAD_ERROR_BUFLEN) break;
  2451. }
  2452. }
  2453. -mp_msg(MSGT_DECAUDIO,MSGL_INFO,"Cannot sync MAD frame\n");
  2454. return 0;
  2455. }
  2456.  
  2457. diff -aur MPlayer-0.90rc2.orig/libmpcodecs/Makefile MPlayer-0.90rc2/libmpcodecs/Makefile
  2458. --- MPlayer-0.90rc2.orig/libmpcodecs/Makefile 2002-12-16 09:49:39.000000000 +0800
  2459. +++ MPlayer-0.90rc2/libmpcodecs/Makefile 2008-09-06 21:57:20.000000000 +0800
  2460. @@ -4,20 +4,20 @@
  2461. LIBNAME = libmpcodecs.a
  2462. LIBNAME2 = libmpencoders.a
  2463.  
  2464. -AUDIO_SRCS_LIB=ad_liba52.c ad_hwac3.c ad_mp3lib.c
  2465. -AUDIO_SRCS_NAT=ad_alaw.c ad_dk3adpcm.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c ad_msgsm.c ad_roqaudio.c
  2466. -AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c
  2467. +AUDIO_SRCS_LIB=ad_liba52.c
  2468. +AUDIO_SRCS_NAT=ad_alaw.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c
  2469. +AUDIO_SRCS_OPT=ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c
  2470. AUDIO_SRCS=dec_audio.c ad.c $(AUDIO_SRCS_LIB) $(AUDIO_SRCS_NAT) $(AUDIO_SRCS_OPT)
  2471.  
  2472. -VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c
  2473. -VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_qtrpza.c vd_raw.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_lcl.c vd_mtga.c
  2474. -VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c
  2475. +VIDEO_SRCS_LIB=
  2476. +VIDEO_SRCS_NAT=vd_null.c vd_raw.c
  2477. +VIDEO_SRCS_OPT=vd_ffmpeg.c
  2478. VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
  2479.  
  2480. -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c
  2481. -ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c
  2482. +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_cropdetect.c vf_test.c vf_lavcdeint.c
  2483. +ENCODER_SRCS=
  2484.  
  2485. -NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c
  2486. +NATIVE_SRCS=
  2487.  
  2488. ifeq ($(FAME),yes)
  2489. VFILTER_SRCS += vf_fame.c
  2490. diff -aur MPlayer-0.90rc2.orig/libmpcodecs/vd.c MPlayer-0.90rc2/libmpcodecs/vd.c
  2491. --- MPlayer-0.90rc2.orig/libmpcodecs/vd.c 2002-11-27 06:54:59.000000000 +0800
  2492. +++ MPlayer-0.90rc2/libmpcodecs/vd.c 2008-09-06 21:57:20.000000000 +0800
  2493. @@ -26,101 +26,15 @@
  2494. //#include "vd_internal.h"
  2495.  
  2496. extern vd_functions_t mpcodecs_vd_null;
  2497. -extern vd_functions_t mpcodecs_vd_cinepak;
  2498. -extern vd_functions_t mpcodecs_vd_qtrpza;
  2499. extern vd_functions_t mpcodecs_vd_ffmpeg;
  2500. -extern vd_functions_t mpcodecs_vd_dshow;
  2501. -extern vd_functions_t mpcodecs_vd_dmo;
  2502. -extern vd_functions_t mpcodecs_vd_vfw;
  2503. -extern vd_functions_t mpcodecs_vd_vfwex;
  2504. -extern vd_functions_t mpcodecs_vd_odivx;
  2505. -extern vd_functions_t mpcodecs_vd_divx4;
  2506. extern vd_functions_t mpcodecs_vd_raw;
  2507. -extern vd_functions_t mpcodecs_vd_xanim;
  2508. -extern vd_functions_t mpcodecs_vd_msrle;
  2509. -extern vd_functions_t mpcodecs_vd_msvidc;
  2510. -extern vd_functions_t mpcodecs_vd_fli;
  2511. -extern vd_functions_t mpcodecs_vd_qtrle;
  2512. -extern vd_functions_t mpcodecs_vd_qtsmc;
  2513. -extern vd_functions_t mpcodecs_vd_roqvideo;
  2514. -extern vd_functions_t mpcodecs_vd_cyuv;
  2515. -extern vd_functions_t mpcodecs_vd_nuv;
  2516. -extern vd_functions_t mpcodecs_vd_mpng;
  2517. -extern vd_functions_t mpcodecs_vd_ijpg;
  2518. -extern vd_functions_t mpcodecs_vd_mtga;
  2519. -extern vd_functions_t mpcodecs_vd_libmpeg2;
  2520. -extern vd_functions_t mpcodecs_vd_huffyuv;
  2521. -extern vd_functions_t mpcodecs_vd_mpegpes;
  2522. -extern vd_functions_t mpcodecs_vd_realvid;
  2523. -extern vd_functions_t mpcodecs_vd_svq1;
  2524. -extern vd_functions_t mpcodecs_vd_xvid;
  2525. -extern vd_functions_t mpcodecs_vd_libdv;
  2526. -extern vd_functions_t mpcodecs_vd_lcl;
  2527. -extern vd_functions_t mpcodecs_vd_lzo;
  2528. -extern vd_functions_t mpcodecs_vd_qtvideo;
  2529.  
  2530. vd_functions_t* mpcodecs_vd_drivers[] = {
  2531. &mpcodecs_vd_null,
  2532. - &mpcodecs_vd_cinepak,
  2533. - &mpcodecs_vd_qtrpza,
  2534. #ifdef USE_LIBAVCODEC
  2535. &mpcodecs_vd_ffmpeg,
  2536. #endif
  2537. -#ifdef USE_WIN32DLL
  2538. -#ifdef USE_DIRECTSHOW
  2539. - &mpcodecs_vd_dshow,
  2540. - &mpcodecs_vd_dmo,
  2541. -#endif
  2542. - &mpcodecs_vd_vfw,
  2543. - &mpcodecs_vd_vfwex,
  2544. -#endif
  2545. -#ifdef USE_DIVX
  2546. - &mpcodecs_vd_odivx,
  2547. -#ifdef NEW_DECORE
  2548. - &mpcodecs_vd_divx4,
  2549. -#endif
  2550. -#endif
  2551. - &mpcodecs_vd_lzo,
  2552. &mpcodecs_vd_raw,
  2553. - &mpcodecs_vd_msrle,
  2554. - &mpcodecs_vd_msvidc,
  2555. - &mpcodecs_vd_fli,
  2556. - &mpcodecs_vd_qtrle,
  2557. - &mpcodecs_vd_qtsmc,
  2558. - &mpcodecs_vd_roqvideo,
  2559. - &mpcodecs_vd_cyuv,
  2560. - &mpcodecs_vd_nuv,
  2561. -#ifdef USE_XANIM
  2562. - &mpcodecs_vd_xanim,
  2563. -#endif
  2564. -#ifdef HAVE_PNG
  2565. - &mpcodecs_vd_mpng,
  2566. -#endif
  2567. -#ifdef HAVE_JPEG
  2568. - &mpcodecs_vd_ijpg,
  2569. -#endif
  2570. - &mpcodecs_vd_mtga,
  2571. -#ifdef USE_LIBMPEG2
  2572. - &mpcodecs_vd_libmpeg2,
  2573. -#endif
  2574. - &mpcodecs_vd_huffyuv,
  2575. - &mpcodecs_vd_mpegpes,
  2576. -#ifdef USE_REALCODECS
  2577. - &mpcodecs_vd_realvid,
  2578. -#endif
  2579. -#ifdef USE_SVQ1
  2580. - &mpcodecs_vd_svq1,
  2581. -#endif
  2582. -#ifdef HAVE_XVID
  2583. - &mpcodecs_vd_xvid,
  2584. -#endif
  2585. -#ifdef HAVE_LIBDV095
  2586. - &mpcodecs_vd_libdv,
  2587. -#endif
  2588. - &mpcodecs_vd_lcl,
  2589. -#ifdef USE_QTX_CODECS
  2590. - &mpcodecs_vd_qtvideo,
  2591. -#endif
  2592. NULL
  2593. };
  2594.  
  2595. diff -aur MPlayer-0.90rc2.orig/libmpcodecs/vf.c MPlayer-0.90rc2/libmpcodecs/vf.c
  2596. --- MPlayer-0.90rc2.orig/libmpcodecs/vf.c 2002-12-05 08:22:37.000000000 +0800
  2597. +++ MPlayer-0.90rc2/libmpcodecs/vf.c 2008-09-06 21:57:20.000000000 +0800
  2598. @@ -16,8 +16,6 @@
  2599. #include "vf.h"
  2600.  
  2601. extern vf_info_t vf_info_vo;
  2602. -extern vf_info_t vf_info_rectangle;
  2603. -extern vf_info_t vf_info_bmovl;
  2604. extern vf_info_t vf_info_crop;
  2605. extern vf_info_t vf_info_expand;
  2606. extern vf_info_t vf_info_pp;
  2607. @@ -26,39 +24,14 @@
  2608. extern vf_info_t vf_info_fame;
  2609. #endif
  2610. extern vf_info_t vf_info_format;
  2611. -extern vf_info_t vf_info_yuy2;
  2612. -extern vf_info_t vf_info_flip;
  2613. -extern vf_info_t vf_info_rgb2bgr;
  2614. -extern vf_info_t vf_info_rotate;
  2615. -extern vf_info_t vf_info_mirror;
  2616. -extern vf_info_t vf_info_palette;
  2617. -extern vf_info_t vf_info_lavc;
  2618. -extern vf_info_t vf_info_dvbscale;
  2619. extern vf_info_t vf_info_cropdetect;
  2620. extern vf_info_t vf_info_test;
  2621. -extern vf_info_t vf_info_noise;
  2622. -extern vf_info_t vf_info_yvu9;
  2623. extern vf_info_t vf_info_lavcdeint;
  2624. -extern vf_info_t vf_info_eq;
  2625. -extern vf_info_t vf_info_eq2;
  2626. -extern vf_info_t vf_info_halfpack;
  2627. -extern vf_info_t vf_info_dint;
  2628. -extern vf_info_t vf_info_1bpp;
  2629. -extern vf_info_t vf_info_2xsai;
  2630. -extern vf_info_t vf_info_unsharp;
  2631. -extern vf_info_t vf_info_swapuv;
  2632. -extern vf_info_t vf_info_il;
  2633. -extern vf_info_t vf_info_boxblur;
  2634. -extern vf_info_t vf_info_sab;
  2635. -extern vf_info_t vf_info_smartblur;
  2636. -extern vf_info_t vf_info_perspective;
  2637.  
  2638. char** vo_plugin_args=(char**) NULL;
  2639.  
  2640. // list of available filters:
  2641. static vf_info_t* filter_list[]={
  2642. - &vf_info_rectangle,
  2643. - &vf_info_bmovl,
  2644. &vf_info_crop,
  2645. &vf_info_expand,
  2646. &vf_info_pp,
  2647. @@ -69,34 +42,11 @@
  2648. &vf_info_fame,
  2649. #endif
  2650. &vf_info_format,
  2651. - &vf_info_yuy2,
  2652. - &vf_info_flip,
  2653. - &vf_info_rgb2bgr,
  2654. - &vf_info_rotate,
  2655. - &vf_info_mirror,
  2656. - &vf_info_palette,
  2657. #ifdef USE_LIBAVCODEC
  2658. - &vf_info_lavc,
  2659. &vf_info_lavcdeint,
  2660. #endif
  2661. - &vf_info_dvbscale,
  2662. &vf_info_cropdetect,
  2663. &vf_info_test,
  2664. - &vf_info_noise,
  2665. - &vf_info_yvu9,
  2666. - &vf_info_eq,
  2667. - &vf_info_eq2,
  2668. - &vf_info_halfpack,
  2669. - &vf_info_dint,
  2670. - &vf_info_1bpp,
  2671. - &vf_info_2xsai,
  2672. - &vf_info_unsharp,
  2673. - &vf_info_swapuv,
  2674. - &vf_info_il,
  2675. - &vf_info_boxblur,
  2676. - &vf_info_sab,
  2677. - &vf_info_smartblur,
  2678. - &vf_info_perspective,
  2679. NULL
  2680. };
  2681.  
  2682. diff -aur MPlayer-0.90rc2.orig/libmpdemux/demuxer.c MPlayer-0.90rc2/libmpdemux/demuxer.c
  2683. --- MPlayer-0.90rc2.orig/libmpdemux/demuxer.c 2002-12-23 05:01:01.000000000 +0800
  2684. +++ MPlayer-0.90rc2/libmpdemux/demuxer.c 2008-09-06 21:57:20.000000000 +0800
  2685. @@ -115,23 +115,13 @@
  2686. free(sh);
  2687. }
  2688.  
  2689. -extern void demux_close_vivo(demuxer_t *demuxer);
  2690. -extern void demux_close_real(demuxer_t *demuxer);
  2691. -extern void demux_close_y4m(demuxer_t *demuxer);
  2692. extern void demux_close_mf(demuxer_t* demuxer);
  2693. -extern void demux_close_roq(demuxer_t* demuxer);
  2694. -extern void demux_close_film(demuxer_t* demuxer);
  2695. extern void demux_close_bmp(demuxer_t* demuxer);
  2696. -extern void demux_close_fli(demuxer_t* demuxer);
  2697. -extern void demux_close_nuv(demuxer_t* demuxer);
  2698. extern void demux_close_audio(demuxer_t* demuxer);
  2699. extern void demux_close_ogg(demuxer_t* demuxer);
  2700. extern void demux_close_rtp(demuxer_t* demuxer);
  2701. extern void demux_close_demuxers(demuxer_t* demuxer);
  2702. extern void demux_close_avi(demuxer_t *demuxer);
  2703. -extern void demux_close_rawdv(demuxer_t* demuxer);
  2704. -extern void demux_close_pva(demuxer_t* demuxer);
  2705. -extern void demux_close_smjpeg(demuxer_t* demuxer);
  2706. extern void demux_close_xmms(demuxer_t* demuxer);
  2707.  
  2708. #ifdef USE_TV
  2709. @@ -149,34 +139,14 @@
  2710. int i;
  2711. mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing demuxer at %p \n",demuxer);
  2712. switch(demuxer->type) {
  2713. - case DEMUXER_TYPE_PVA:
  2714. - demux_close_pva(demuxer); break;
  2715. - case DEMUXER_TYPE_VIVO:
  2716. - demux_close_vivo(demuxer); break;
  2717. - case DEMUXER_TYPE_REAL:
  2718. - demux_close_real(demuxer); break;
  2719. - case DEMUXER_TYPE_Y4M:
  2720. - demux_close_y4m(demuxer); break;
  2721. case DEMUXER_TYPE_MF:
  2722. demux_close_mf(demuxer); break;
  2723. - case DEMUXER_TYPE_ROQ:
  2724. - demux_close_roq(demuxer); break;
  2725. - case DEMUXER_TYPE_FILM:
  2726. - demux_close_film(demuxer); break;
  2727. case DEMUXER_TYPE_BMP:
  2728. demux_close_bmp(demuxer); break;
  2729. - case DEMUXER_TYPE_FLI:
  2730. - demux_close_fli(demuxer); break;
  2731. - case DEMUXER_TYPE_NUV:
  2732. - demux_close_nuv(demuxer); break;
  2733. #if defined(USE_TV) && defined(HAVE_TV_V4L)
  2734. case DEMUXER_TYPE_TV:
  2735. demux_close_tv(demuxer); break;
  2736. #endif
  2737. -#ifdef HAVE_LIBDV095
  2738. - case DEMUXER_TYPE_RAWDV:
  2739. - demux_close_rawdv(demuxer); break;
  2740. -#endif
  2741. case DEMUXER_TYPE_AUDIO:
  2742. demux_close_audio(demuxer); break;
  2743. #ifdef HAVE_OGGVORBIS
  2744. @@ -187,8 +157,6 @@
  2745. case DEMUXER_TYPE_RTP:
  2746. demux_close_rtp(demuxer); break;
  2747. #endif
  2748. - case DEMUXER_TYPE_SMJPEG:
  2749. - demux_close_smjpeg(demuxer); return;
  2750. case DEMUXER_TYPE_DEMUXERS:
  2751. demux_close_demuxers(demuxer); return;
  2752. case DEMUXER_TYPE_AVI:
  2753. @@ -256,59 +224,36 @@
  2754. // 0 = EOF or no stream found or invalid type
  2755. // 1 = successfully read a packet
  2756. int demux_mf_fill_buffer( demuxer_t *demux);
  2757. -int demux_roq_fill_buffer(demuxer_t *demux);
  2758. -int demux_film_fill_buffer(demuxer_t *demux);
  2759. int demux_bmp_fill_buffer(demuxer_t *demux);
  2760. -int demux_fli_fill_buffer(demuxer_t *demux);
  2761. int demux_mpg_es_fill_buffer(demuxer_t *demux);
  2762. int demux_mpg_fill_buffer(demuxer_t *demux);
  2763. int demux_avi_fill_buffer(demuxer_t *demux);
  2764. int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds);
  2765. int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds);
  2766. int demux_asf_fill_buffer(demuxer_t *demux);
  2767. -int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds);
  2768. -int demux_vivo_fill_buffer(demuxer_t *demux);
  2769. -int demux_real_fill_buffer(demuxer_t *demuxer);
  2770. -int demux_nuv_fill_buffer(demuxer_t *demux);
  2771. int demux_rtp_fill_buffer(demuxer_t *demux, demux_stream_t* ds);
  2772. -int demux_rawdv_fill_buffer(demuxer_t *demuxer);
  2773. -int demux_y4m_fill_buffer(demuxer_t *demux);
  2774. int demux_audio_fill_buffer(demux_stream_t *ds);
  2775. -int demux_pva_fill_buffer(demuxer_t *demux);
  2776. int demux_xmms_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
  2777.  
  2778. extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
  2779. extern int demux_ogg_fill_buffer(demuxer_t *d);
  2780. extern int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds);
  2781. -extern int demux_smjpeg_fill_buffer(demuxer_t* demux);
  2782.  
  2783. int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
  2784. // Note: parameter 'ds' can be NULL!
  2785. // printf("demux->type=%d\n",demux->type);
  2786. switch(demux->type){
  2787. case DEMUXER_TYPE_MF: return demux_mf_fill_buffer(demux);
  2788. - case DEMUXER_TYPE_ROQ: return demux_roq_fill_buffer(demux);
  2789. - case DEMUXER_TYPE_FILM: return demux_film_fill_buffer(demux);
  2790. case DEMUXER_TYPE_BMP: return demux_bmp_fill_buffer(demux);
  2791. - case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux);
  2792. case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux);
  2793. case DEMUXER_TYPE_MPEG_PS: return demux_mpg_fill_buffer(demux);
  2794. case DEMUXER_TYPE_AVI: return demux_avi_fill_buffer(demux);
  2795. case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds);
  2796. case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds);
  2797. case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux);
  2798. - case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds);
  2799. - case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux);
  2800. - case DEMUXER_TYPE_PVA: return demux_pva_fill_buffer(demux);
  2801. -#ifdef HAVE_LIBDV095
  2802. - case DEMUXER_TYPE_RAWDV: return demux_rawdv_fill_buffer(demux);
  2803. -#endif
  2804. - case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux);
  2805. - case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux);
  2806. #ifdef USE_TV
  2807. case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds);
  2808. #endif
  2809. - case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux);
  2810. case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds);
  2811. #ifdef HAVE_XMMS
  2812. case DEMUXER_TYPE_XMMS: return demux_xmms_fill_buffer(demux,ds);
  2813. @@ -321,7 +266,6 @@
  2814. #ifdef STREAMING_LIVE_DOT_COM
  2815. case DEMUXER_TYPE_RTP: return demux_rtp_fill_buffer(demux, ds);
  2816. #endif
  2817. - case DEMUXER_TYPE_SMJPEG: return demux_smjpeg_fill_buffer(demux);
  2818. }
  2819. return 0;
  2820. }
  2821. @@ -516,32 +460,12 @@
  2822. demuxer_t* demux_open_avi(demuxer_t* demuxer);
  2823. int mov_check_file(demuxer_t* demuxer);
  2824. int mov_read_header(demuxer_t* demuxer);
  2825. -int demux_open_fli(demuxer_t* demuxer);
  2826. int demux_open_mf(demuxer_t* demuxer);
  2827. -int demux_open_film(demuxer_t* demuxer);
  2828. int demux_open_bmp(demuxer_t* demuxer);
  2829. -int demux_open_roq(demuxer_t* demuxer);
  2830. -#ifdef HAVE_LIBDV095
  2831. -int demux_open_rawdv(demuxer_t* demuxer);
  2832. -extern int rawdv_check_file(demuxer_t *demuxer);
  2833. -#endif
  2834. -
  2835. -extern int vivo_check_file(demuxer_t *demuxer);
  2836. -extern void demux_open_vivo(demuxer_t *demuxer);
  2837. -extern int y4m_check_file(demuxer_t *demuxer);
  2838. -extern void demux_open_y4m(demuxer_t *demuxer);
  2839. -extern int roq_check_file(demuxer_t *demuxer);
  2840. -extern int pva_check_file(demuxer_t * demuxer);
  2841. -extern demuxer_t * demux_open_pva(demuxer_t * demuxer);
  2842. -extern int real_check_file(demuxer_t *demuxer);
  2843. -extern void demux_open_real(demuxer_t *demuxer);
  2844. -extern int nuv_check_file(demuxer_t *demuxer);
  2845. -extern void demux_open_nuv(demuxer_t *demuxer);
  2846. +
  2847. extern int demux_audio_open(demuxer_t* demuxer);
  2848. extern int demux_ogg_open(demuxer_t* demuxer);
  2849. extern int demux_rawaudio_open(demuxer_t* demuxer);
  2850. -extern int smjpeg_check_file(demuxer_t *demuxer);
  2851. -extern int demux_open_smjpeg(demuxer_t* demuxer);
  2852. extern int bmp_check_file(demuxer_t *demuxer);
  2853. extern int demux_xmms_open(demuxer_t* demuxer);
  2854.  
  2855. @@ -612,17 +536,6 @@
  2856. }
  2857. }
  2858. }
  2859. -//=============== Try to open as Y4M file: =================
  2860. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
  2861. - demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
  2862. - if(y4m_check_file(demuxer)){
  2863. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"YUV4MPEG2");
  2864. - file_format=DEMUXER_TYPE_Y4M;
  2865. - } else {
  2866. - free_demuxer(demuxer);
  2867. - demuxer = NULL;
  2868. - }
  2869. -}
  2870. //=============== Try to open as ASF file: =================
  2871. if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
  2872. demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
  2873. @@ -634,93 +547,6 @@
  2874. demuxer = NULL;
  2875. }
  2876. }
  2877. -//=============== Try to open as NUV file: =================
  2878. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){
  2879. - demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id);
  2880. - if(nuv_check_file(demuxer)){
  2881. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"NuppelVideo");
  2882. - file_format=DEMUXER_TYPE_NUV;
  2883. - } else {
  2884. - free_demuxer(demuxer);
  2885. - demuxer = NULL;
  2886. - }
  2887. -}
  2888. -//=============== Try to open as MOV file: =================
  2889. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
  2890. - demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
  2891. - if(mov_check_file(demuxer)){
  2892. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"QuickTime/MOV");
  2893. - file_format=DEMUXER_TYPE_MOV;
  2894. - } else {
  2895. - free_demuxer(demuxer);
  2896. - demuxer = NULL;
  2897. - }
  2898. -}
  2899. -//=============== Try to open as VIVO file: =================
  2900. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){
  2901. - demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id);
  2902. - if(vivo_check_file(demuxer)){
  2903. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat, "VIVO");
  2904. - file_format=DEMUXER_TYPE_VIVO;
  2905. - } else {
  2906. - free_demuxer(demuxer);
  2907. - demuxer = NULL;
  2908. - }
  2909. -}
  2910. -//=============== Try to open as REAL file: =================
  2911. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){
  2912. - demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id);
  2913. - if(real_check_file(demuxer)){
  2914. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"REAL");
  2915. - file_format=DEMUXER_TYPE_REAL;
  2916. - } else {
  2917. - free_demuxer(demuxer);
  2918. - demuxer = NULL;
  2919. - }
  2920. -}
  2921. -//=============== Try to open as FLI file: =================
  2922. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){
  2923. - demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id);
  2924. - {
  2925. - int id;
  2926. - stream_seek(demuxer->stream, 4);
  2927. - id=stream_read_word_le(demuxer->stream);
  2928. - // check for the FLI file magic number
  2929. - if((id==0xAF11) || (id==0xAF12)){
  2930. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FLI");
  2931. - file_format=DEMUXER_TYPE_FLI;
  2932. - } else {
  2933. - free_demuxer(demuxer);
  2934. - demuxer = NULL;
  2935. - }
  2936. - }
  2937. -}
  2938. -//=============== Try to open as FILM file: =================
  2939. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FILM){
  2940. - demuxer=new_demuxer(stream,DEMUXER_TYPE_FILM,audio_id,video_id,dvdsub_id);
  2941. - {
  2942. - int signature=stream_read_fourcc(demuxer->stream);
  2943. - // check for the FLI file magic number
  2944. - if(signature==mmioFOURCC('F', 'I', 'L', 'M')){
  2945. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FILM");
  2946. - file_format=DEMUXER_TYPE_FILM;
  2947. - } else {
  2948. - free_demuxer(demuxer);
  2949. - demuxer = NULL;
  2950. - }
  2951. - }
  2952. -}
  2953. -//=============== Try to open as RoQ file: =================
  2954. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){
  2955. - demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id);
  2956. - if(roq_check_file(demuxer)){
  2957. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ROQ");
  2958. - file_format=DEMUXER_TYPE_ROQ;
  2959. - } else {
  2960. - free_demuxer(demuxer);
  2961. - demuxer = NULL;
  2962. - }
  2963. -}
  2964. //=============== Try to open as BMP file: =================
  2965. if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_BMP){
  2966. demuxer=new_demuxer(stream,DEMUXER_TYPE_BMP,audio_id,video_id,dvdsub_id);
  2967. @@ -732,17 +558,6 @@
  2968. demuxer = NULL;
  2969. }
  2970. }
  2971. -//=============== Try to open as SMJPEG file: =================
  2972. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_SMJPEG){
  2973. - demuxer=new_demuxer(stream,DEMUXER_TYPE_SMJPEG,audio_id,video_id,dvdsub_id);
  2974. - if(smjpeg_check_file(demuxer)){
  2975. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"SMJPEG");
  2976. - file_format=DEMUXER_TYPE_SMJPEG;
  2977. - } else {
  2978. - free_demuxer(demuxer);
  2979. - demuxer = NULL;
  2980. - }
  2981. -}
  2982. #ifdef HAVE_OGGVORBIS
  2983. //=============== Try to open as Ogg file: =================
  2984. if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){
  2985. @@ -756,17 +571,6 @@
  2986. }
  2987. }
  2988. #endif
  2989. -//=============== Try to open as PVA file: =================
  2990. -if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){
  2991. - demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id);
  2992. - if(pva_check_file(demuxer)) {
  2993. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"PVA");
  2994. - file_format=DEMUXER_TYPE_PVA;
  2995. - } else {
  2996. - free_demuxer(demuxer);
  2997. - demuxer=NULL;
  2998. - }
  2999. -}
  3000. //=============== Try to open as MPEG-PS file: =================
  3001. if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
  3002. int pes=1;
  3003. @@ -836,20 +640,6 @@
  3004. mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-ES");
  3005. }
  3006. }
  3007. -#ifdef HAVE_LIBDV095
  3008. -//=============== Try to open raw DV file, as produced by dvgrab --format raw =================
  3009. -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_RAWDV)
  3010. -{
  3011. - demuxer=new_demuxer(stream,DEMUXER_TYPE_RAWDV,audio_id,video_id,dvdsub_id);
  3012. - if(rawdv_check_file(demuxer))
  3013. - {
  3014. - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"RAWDV");
  3015. - file_format=DEMUXER_TYPE_RAWDV;
  3016. - }
  3017. - else
  3018. - free_demuxer(demuxer);
  3019. -}
  3020. -#endif
  3021. //=============== Try to open as audio file: =================
  3022. if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){
  3023. demuxer=new_demuxer(stream,DEMUXER_TYPE_AUDIO,audio_id,video_id,dvdsub_id);
  3024. @@ -892,13 +682,6 @@
  3025. demuxer->file_format=file_format;
  3026.  
  3027. switch(file_format){
  3028. -#ifdef HAVE_LIBDV095
  3029. - case DEMUXER_TYPE_RAWDV:
  3030. - {
  3031. - if (!demux_open_rawdv(demuxer)) return NULL;
  3032. - break;
  3033. - }
  3034. -#endif
  3035. case DEMUXER_TYPE_RAWAUDIO: {
  3036. demux_rawaudio_open(demuxer);
  3037. break;
  3038. @@ -907,32 +690,10 @@
  3039. if (!demux_open_mf(demuxer)) return NULL;
  3040. break;
  3041. }
  3042. - case DEMUXER_TYPE_FLI: {
  3043. - if (!demux_open_fli(demuxer)) return NULL;
  3044. - break;
  3045. - }
  3046. - case DEMUXER_TYPE_FILM: {
  3047. - if (!demux_open_film(demuxer)) return NULL;
  3048. - break;
  3049. - }
  3050. case DEMUXER_TYPE_BMP: {
  3051. if (!demux_open_bmp(demuxer)) return NULL;
  3052. break;
  3053. }
  3054. - case DEMUXER_TYPE_ROQ: {
  3055. - if (!demux_open_roq(demuxer)) return NULL;
  3056. - break;
  3057. - }
  3058. - case DEMUXER_TYPE_SMJPEG: {
  3059. - if (!demux_open_smjpeg(demuxer)) return NULL;
  3060. - break;
  3061. - }
  3062. - case DEMUXER_TYPE_MOV: {
  3063. - if(!mov_read_header(demuxer)) return NULL;
  3064. -// sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video;
  3065. -// sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio;
  3066. - break;
  3067. - }
  3068. case DEMUXER_TYPE_AVI: {
  3069. sh_audio_t* sh_a;
  3070. demuxer = (demuxer_t*) demux_open_avi(demuxer);
  3071. @@ -960,26 +721,6 @@
  3072. return demuxer;
  3073. // break;
  3074. }
  3075. - case DEMUXER_TYPE_NUV: {
  3076. - demux_open_nuv(demuxer);
  3077. - break;
  3078. - }
  3079. - case DEMUXER_TYPE_VIVO: {
  3080. - demux_open_vivo(demuxer);
  3081. - break;
  3082. - }
  3083. - case DEMUXER_TYPE_PVA: {
  3084. - demux_open_pva(demuxer);
  3085. - break;
  3086. - }
  3087. - case DEMUXER_TYPE_Y4M: {
  3088. - demux_open_y4m(demuxer);
  3089. - break;
  3090. - }
  3091. - case DEMUXER_TYPE_REAL: {
  3092. - demux_open_real(demuxer);
  3093. - break;
  3094. - }
  3095. case DEMUXER_TYPE_ASF: {
  3096. //---- ASF header:
  3097. read_asf_header(demuxer);
  3098. @@ -1114,18 +855,7 @@
  3099. int demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3100. int demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3101. int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3102. -int demux_seek_y4m(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3103. -int demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3104. -int demux_seek_film(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3105. int demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3106. -int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3107. -void demux_seek_mov(demuxer_t *demuxer,float pts,int flags);
  3108. -int demux_seek_real(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3109. -int demux_seek_pva(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3110. -
  3111. -#ifdef HAVE_LIBDV095
  3112. -int demux_seek_rawdv(demuxer_t *demuxer, float pts, int flags);
  3113. -#endif
  3114.  
  3115. extern void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3116. extern void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
  3117. @@ -1168,10 +898,6 @@
  3118.  
  3119. switch(demuxer->file_format){
  3120.  
  3121. -#ifdef HAVE_LIBDV095
  3122. - case DEMUXER_TYPE_RAWDV:
  3123. - demux_seek_rawdv(demuxer,rel_seek_secs,flags); break;
  3124. -#endif
  3125. case DEMUXER_TYPE_AVI:
  3126. demux_seek_avi(demuxer,rel_seek_secs,flags); break;
  3127.  
  3128. @@ -1182,27 +908,9 @@
  3129. case DEMUXER_TYPE_MPEG_PS:
  3130. demux_seek_mpg(demuxer,rel_seek_secs,flags); break;
  3131.  
  3132. - case DEMUXER_TYPE_MOV:
  3133. - demux_seek_mov(demuxer,rel_seek_secs,flags); break;
  3134. -
  3135. - case DEMUXER_TYPE_REAL:
  3136. - demux_seek_real(demuxer,rel_seek_secs,flags); break;
  3137. -
  3138. - case DEMUXER_TYPE_Y4M:
  3139. - demux_seek_y4m(demuxer,rel_seek_secs,flags); break;
  3140. -
  3141. case DEMUXER_TYPE_MF:
  3142. demux_seek_mf(demuxer,rel_seek_secs,flags); break;
  3143.  
  3144. - case DEMUXER_TYPE_PVA:
  3145. - demux_seek_pva(demuxer,rel_seek_secs,flags); break;
  3146. -
  3147. - case DEMUXER_TYPE_FLI:
  3148. - demux_seek_fli(demuxer,rel_seek_secs,flags); break;
  3149. - case DEMUXER_TYPE_FILM:
  3150. - demux_seek_film(demuxer,rel_seek_secs,flags); break;
  3151. - case DEMUXER_TYPE_NUV:
  3152. - demux_seek_nuv(demuxer,rel_seek_secs,flags); break;
  3153. case DEMUXER_TYPE_AUDIO:
  3154. demux_audio_seek(demuxer,rel_seek_secs,flags); break;
  3155. case DEMUXER_TYPE_DEMUXERS:
  3156. diff -aur MPlayer-0.90rc2.orig/libmpdemux/demuxer.h MPlayer-0.90rc2/libmpdemux/demuxer.h
  3157. --- MPlayer-0.90rc2.orig/libmpdemux/demuxer.h 2002-12-23 05:01:01.000000000 +0800
  3158. +++ MPlayer-0.90rc2/libmpdemux/demuxer.h 2008-09-06 21:57:20.000000000 +0800
  3159. @@ -16,23 +16,14 @@
  3160. #define DEMUXER_TYPE_AVI_NINI 5
  3161. #define DEMUXER_TYPE_ASF 6
  3162. #define DEMUXER_TYPE_MOV 7
  3163. -#define DEMUXER_TYPE_VIVO 8
  3164. #define DEMUXER_TYPE_TV 9
  3165. -#define DEMUXER_TYPE_FLI 10
  3166. #define DEMUXER_TYPE_REAL 11
  3167. -#define DEMUXER_TYPE_Y4M 12
  3168. -#define DEMUXER_TYPE_NUV 13
  3169. -#define DEMUXER_TYPE_FILM 14
  3170. -#define DEMUXER_TYPE_ROQ 15
  3171. #define DEMUXER_TYPE_MF 16
  3172. #define DEMUXER_TYPE_AUDIO 17
  3173. #define DEMUXER_TYPE_OGG 18
  3174. #define DEMUXER_TYPE_BMP 19
  3175. #define DEMUXER_TYPE_RAWAUDIO 20
  3176. #define DEMUXER_TYPE_RTP 21
  3177. -#define DEMUXER_TYPE_RAWDV 22
  3178. -#define DEMUXER_TYPE_PVA 23
  3179. -#define DEMUXER_TYPE_SMJPEG 24
  3180. #define DEMUXER_TYPE_XMMS 25
  3181.  
  3182. // This should always match the higest demuxer type number.
  3183. diff -aur MPlayer-0.90rc2.orig/libmpdemux/Makefile MPlayer-0.90rc2/libmpdemux/Makefile
  3184. --- MPlayer-0.90rc2.orig/libmpdemux/Makefile 2002-12-23 05:01:01.000000000 +0800
  3185. +++ MPlayer-0.90rc2/libmpdemux/Makefile 2008-09-06 21:57:20.000000000 +0800
  3186. @@ -3,7 +3,7 @@
  3187.  
  3188. include ../config.mak
  3189.  
  3190. -SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c
  3191. +SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c parse_mp4.c demux_mpg.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c cdinfo.c ai_alsa.c ai_oss.c audio_in.c
  3192. ifeq ($(XMMS_PLUGINS),yes)
  3193. SRCS += demux_xmms.c
  3194. endif
  3195. diff -aur MPlayer-0.90rc2.orig/libmpdemux/network.c MPlayer-0.90rc2/libmpdemux/network.c
  3196. --- MPlayer-0.90rc2.orig/libmpdemux/network.c 2002-11-06 03:03:52.000000000 +0800
  3197. +++ MPlayer-0.90rc2/libmpdemux/network.c 2008-09-06 21:57:20.000000000 +0800
  3198. @@ -56,8 +56,6 @@
  3199. { "video/x-mpeg2", DEMUXER_TYPE_MPEG_PS },
  3200. // AVI ??? => video/x-msvideo
  3201. { "video/x-msvideo", DEMUXER_TYPE_AVI },
  3202. - // MOV => video/quicktime
  3203. - { "video/quicktime", DEMUXER_TYPE_MOV },
  3204. // ASF
  3205. { "audio/x-ms-wax", DEMUXER_TYPE_ASF },
  3206. { "audio/x-ms-wma", DEMUXER_TYPE_ASF },
  3207. @@ -71,8 +69,6 @@
  3208. { "audio/x-scpls", DEMUXER_TYPE_PLAYLIST },
  3209. { "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST },
  3210. { "audio/x-pls", DEMUXER_TYPE_PLAYLIST },
  3211. - // Real Media
  3212. - { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL },
  3213. // OGG Streaming
  3214. { "application/x-ogg", DEMUXER_TYPE_OGG }
  3215.  
  3216. @@ -92,10 +88,6 @@
  3217. { "asf", DEMUXER_TYPE_ASF },
  3218. { "wmv", DEMUXER_TYPE_ASF },
  3219. { "wma", DEMUXER_TYPE_ASF },
  3220. - { "viv", DEMUXER_TYPE_VIVO },
  3221. - { "rm", DEMUXER_TYPE_REAL },
  3222. - { "ra", DEMUXER_TYPE_REAL },
  3223. - { "y4m", DEMUXER_TYPE_Y4M },
  3224. { "mp3", DEMUXER_TYPE_AUDIO },
  3225. { "ogg", DEMUXER_TYPE_OGG },
  3226. { "wav", DEMUXER_TYPE_AUDIO },
  3227. @@ -867,13 +859,6 @@
  3228. case DEMUXER_TYPE_MPEG_ES:
  3229. case DEMUXER_TYPE_MPEG_PS:
  3230. case DEMUXER_TYPE_AVI:
  3231. - case DEMUXER_TYPE_MOV:
  3232. - case DEMUXER_TYPE_VIVO:
  3233. - case DEMUXER_TYPE_FLI:
  3234. - case DEMUXER_TYPE_REAL:
  3235. - case DEMUXER_TYPE_Y4M:
  3236. - case DEMUXER_TYPE_FILM:
  3237. - case DEMUXER_TYPE_ROQ:
  3238. case DEMUXER_TYPE_AUDIO:
  3239. case DEMUXER_TYPE_OGG:
  3240. case DEMUXER_TYPE_PLAYLIST:
  3241. diff -aur MPlayer-0.90rc2.orig/libmpdemux/video.c MPlayer-0.90rc2/libmpdemux/video.c
  3242. --- MPlayer-0.90rc2.orig/libmpdemux/video.c 2002-11-02 01:46:43.000000000 +0800
  3243. +++ MPlayer-0.90rc2/libmpdemux/video.c 2008-09-06 21:57:20.000000000 +0800
  3244. @@ -86,7 +86,6 @@
  3245. if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break;
  3246. // otherwise fall through to...
  3247. #endif
  3248. - case DEMUXER_TYPE_PVA:
  3249. case DEMUXER_TYPE_MPEG_ES:
  3250. case DEMUXER_TYPE_MPEG_PS: {
  3251. //mpeg_header_parser:
  3252. @@ -220,7 +219,6 @@
  3253. *start=NULL;
  3254.  
  3255. if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS
  3256. - || demuxer->file_format==DEMUXER_TYPE_PVA
  3257. #ifdef STREAMING_LIVE_DOT_COM
  3258. || (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer))
  3259. #endif
  3260. @@ -314,9 +312,6 @@
  3261. #ifdef USE_TV
  3262. case DEMUXER_TYPE_TV:
  3263. #endif
  3264. - case DEMUXER_TYPE_MOV:
  3265. - case DEMUXER_TYPE_FILM:
  3266. - case DEMUXER_TYPE_VIVO:
  3267. case DEMUXER_TYPE_ASF: {
  3268. float next_pts = ds_get_next_pts(d_video);
  3269. float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1;
  3270. diff -aur MPlayer-0.90rc2.orig/libvo/Makefile MPlayer-0.90rc2/libvo/Makefile
  3271. --- MPlayer-0.90rc2.orig/libvo/Makefile 2002-11-10 21:12:53.000000000 +0800
  3272. +++ MPlayer-0.90rc2/libvo/Makefile 2008-09-06 21:57:20.000000000 +0800
  3273. @@ -3,7 +3,7 @@
  3274.  
  3275. LIBNAME = libvo.a
  3276.  
  3277. -SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
  3278. +SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
  3279. OBJS=$(SRCS:.c=.o)
  3280.  
  3281. ifeq ($(VIDIX),yes)
  3282. diff -aur MPlayer-0.90rc2.orig/libvo/video_out.c MPlayer-0.90rc2/libvo/video_out.c
  3283. --- MPlayer-0.90rc2.orig/libvo/video_out.c 2002-11-11 23:20:25.000000000 +0800
  3284. +++ MPlayer-0.90rc2/libvo/video_out.c 2008-09-06 21:57:20.000000000 +0800
  3285. @@ -64,16 +64,12 @@
  3286. //extern vo_functions_t video_out_odivx;
  3287. extern vo_functions_t video_out_zr;
  3288. extern vo_functions_t video_out_bl;
  3289. -extern vo_functions_t video_out_pgm;
  3290. -extern vo_functions_t video_out_md5;
  3291. extern vo_functions_t video_out_syncfb;
  3292. extern vo_functions_t video_out_fbdev;
  3293. extern vo_functions_t video_out_svga;
  3294. extern vo_functions_t video_out_png;
  3295. extern vo_functions_t video_out_ggi;
  3296. extern vo_functions_t video_out_aa;
  3297. -extern vo_functions_t video_out_mpegpes;
  3298. -extern vo_functions_t video_out_yuv4mpeg;
  3299. #ifdef HAVE_DIRECTX
  3300. extern vo_functions_t video_out_directx;
  3301. #endif
  3302. @@ -173,10 +169,6 @@
  3303. #endif
  3304. &video_out_null,
  3305. // &video_out_odivx,
  3306. - &video_out_pgm,
  3307. - &video_out_md5,
  3308. - &video_out_mpegpes,
  3309. - &video_out_yuv4mpeg,
  3310. #ifdef HAVE_VESA
  3311. &video_out_vesa,
  3312. #endif
  3313. diff -aur MPlayer-0.90rc2.orig/Makefile MPlayer-0.90rc2/Makefile
  3314. --- MPlayer-0.90rc2.orig/Makefile 2002-12-23 05:00:46.000000000 +0800
  3315. +++ MPlayer-0.90rc2/Makefile 2008-09-06 21:57:20.000000000 +0800
  3316. @@ -36,11 +36,11 @@
  3317. VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(GIF_LIB)
  3318. AO_LIBS = $(ARTS_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
  3319. CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(XVID_LIB) $(DECORE_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
  3320. -COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
  3321. +COMMON_LIBS = libmpcodecs/libmpcodecs.a liba52/liba52.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
  3322.  
  3323. CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
  3324.  
  3325. -PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers linux postproc input libvo libaf
  3326. +PARTS = libmpdemux libmpcodecs liba52 libavcodec libao2 drivers linux postproc input libvo libaf
  3327. ifeq ($(VIDIX),yes)
  3328. PARTS += libdha vidix
  3329. endif
  3330. @@ -72,7 +72,7 @@
  3331. ALL_PRG += $(PRG_FIBMAP)
  3332. endif
  3333.  
  3334. -COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
  3335. +COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a linux/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
  3336. ifeq (($SHARED_PP),yes)
  3337. COMMON_DEPS += postproc/libpostproc.so
  3338. else
  3339. @@ -138,9 +138,6 @@
  3340. libavcodec/libavcodec.a:
  3341. $(MAKE) -C libavcodec
  3342.  
  3343. -libmpeg2/libmpeg2.a:
  3344. - $(MAKE) -C libmpeg2
  3345. -
  3346. libvo/libvo.a:
  3347. $(MAKE) -C libvo
  3348.  
  3349. @@ -150,9 +147,6 @@
  3350. liba52/liba52.a:
  3351. $(MAKE) -C liba52
  3352.  
  3353. -mp3lib/libMP3.a:
  3354. - $(MAKE) -C mp3lib
  3355. -
  3356. libdha/libdha.so:
  3357. $(MAKE) -C libdha
  3358.  
  3359.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!