Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

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