ports/156747: multimedia/mplayer: fix 24-bits OSS some improvements

[Zhihao Yuan]

The following reply was made to PR ports/156747; it has been noted by GNATS.

From: Zhihao Yuan <lichray at gmail.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/156747: multimedia/mplayer: fix 24-bits OSS some improvements
Date: Sun, 1 May 2011 14:25:43 -0500

 --00151744872289fcb704a23bdf27
 Content-Type: text/plain; charset=UTF-8
 
 The macro __FreeBSD__ does guarantee the FreeBSD-only 24bit-3bytes
 macros since 1997. But, just in case, I added one more macro test.
 
 Although I don't think there are users who do no update their -current
 boxes, I added a -current log2 test to Makefile.
 
 And I synchronized the modification to Makefile to mencoder.
 
 I think these patches are stable enough.
 
 -- 
 Zhihao Yuan
 The best way to predict the future is to invent it.
 
 --00151744872289fcb704a23bdf27
 Content-Type: application/octet-stream; name=patch-mplayer_1
 Content-Disposition: attachment; filename=patch-mplayer_1
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_gn6d95cn0
 
 ZGlmZiAtcnVOIC0tZXhjbHVkZT1DVlMgL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIub3Jp
 Zy9NYWtlZmlsZSAvdXNyL3BvcnRzL211bHRpbWVkaWEvbXBsYXllci9NYWtlZmlsZQotLS0gL3Vz
 ci9wb3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIub3JpZy9NYWtlZmlsZQkyMDExLTA0LTAxIDA2OjA5
 OjM2LjAwMDAwMDAwMCAtMDUwMAorKysgL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIvTWFr
 ZWZpbGUJMjAxMS0wNS0wMSAxNDowOTo0Ni45OTMzNTk3MzEgLTA1MDAKQEAgLTcsNyArNyw3IEBA
 CiAKIFBPUlROQU1FPQltcGxheWVyCiBQT1JUVkVSU0lPTj0JJHtNUExBWUVSX1BPUlRfVkVSU0lP
 Tn0KLVBPUlRSRVZJU0lPTj0JMAorUE9SVFJFVklTSU9OPQkxCiBDT01NRU5UPQlIaWdoIHBlcmZv
 cm1hbmNlIG1lZGlhIHBsYXllciBzdXBwb3J0aW5nIG1hbnkgZm9ybWF0cwogCiAuaW5jbHVkZSAi
 JHsuQ1VSRElSfS9NYWtlZmlsZS5zaGFyZWQiCkBAIC04OSw2ICs4OSw3IEBACiAJCQktLWRpc2Fi
 bGUtbGliZGlyYWMtbGF2YyBcCiAJCQktLWRpc2FibGUtbWVuY29kZXIgXAogCQkJLS1kaXNhYmxl
 LW1wZzEyMyBcCisJCQktLWRpc2FibGUtYWxzYSBcCiAJCQktLWRpc2FibGUtbXVzZXBhY2sKIAog
 LmluY2x1ZGUgIiR7LkNVUkRJUn0vTWFrZWZpbGUub3B0aW9ucyIKQEAgLTI3Miw5ICsyNzMsMTMg
 QEAKIAkJJHtXUktTUkN9L2NvbmZpZy5tYWsKIAlAJHtSRUlOUExBQ0VfQ01EfSBcCiAJCS1lICdz
 I0hBVkVfRkFTVF9DTU9WIDEjSEFWRV9GQVNUX0NNT1YgMCNnJyBcCisJCSR7V1JLU1JDfS9jb25m
 aWcuaAorLmlmICR7T1NWRVJTSU9OfSA8IDgwMjUwMiB8fCAoJHtPU1ZFUlNJT059ID49IDkwMDAw
 MCAmJiAke09TVkVSU0lPTn0gPCA5MDAwMjcpCisJQCR7UkVJTlBMQUNFX0NNRH0gXAogCQktZSAn
 cyNIQVZFX0xPRzIgMSNIQVZFX0xPRzIgMCNnJyBcCiAJCS1lICdzI0hBVkVfTE9HMkYgMSNIQVZF
 X0xPRzJGIDAjZycgXAogCQkke1dSS1NSQ30vY29uZmlnLmgKKy5lbmRpZgogCiBwb3N0LWluc3Rh
 bGw6CiAJQCR7TUtESVJ9ICR7REFUQURJUn0KZGlmZiAtcnVOIC0tZXhjbHVkZT1DVlMgL3Vzci9w
 b3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIub3JpZy9maWxlcy9wYXRjaC1saWJhbzItYW9fb3NzLmMg
 L3Vzci9wb3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYW8yLWFvX29zcy5j
 Ci0tLSAvdXNyL3BvcnRzL211bHRpbWVkaWEvbXBsYXllci5vcmlnL2ZpbGVzL3BhdGNoLWxpYmFv
 Mi1hb19vc3MuYwkyMDEwLTA0LTIxIDA4OjA3OjIyLjAwMDAwMDAwMCAtMDUwMAorKysgL3Vzci9w
 b3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYW8yLWFvX29zcy5jCTIwMTEt
 MDUtMDEgMTQ6MTI6NDkuODI5MjU0NzI5IC0wNTAwCkBAIC0xLDE0ICsxLDM4IEBACi0tLS0gbGli
 YW8yL2FvX29zcy5jLm9yaWcJMjAwOS0wNS0xMiAyMTo1ODo1Ny4wMDAwMDAwMDAgLTA1MDAKLSsr
 KyBsaWJhbzIvYW9fb3NzLmMJMjAwOS0wNy0yMyAxOTo1ODo0NC44NzAwOTcyMDMgLTA1MDAKLUBA
 IC00NTMsNiArNDUzLDcgQEAKKy0tLSBsaWJhbzIvYW9fb3NzLmMub3JpZwkyMDEwLTAxLTExIDE0
 OjI3OjUyLjAwMDAwMDAwMCAtMDYwMAorKysrIGxpYmFvMi9hb19vc3MuYwkyMDExLTA1LTAxIDAz
 OjI0OjM3LjQ2NTU4MDM2MiAtMDUwMAorQEAgLTcyLDYgKzcyLDExIEBAIHN0YXRpYyBpbnQgZm9y
 bWF0Mm9zcyhpbnQgZm9ybWF0KQorICAgICBjYXNlIEFGX0ZPUk1BVF9TMTZfQkU6IHJldHVybiBB
 Rk1UX1MxNl9CRTsKKyAjaWZkZWYgQUZNVF9TMjRfUEFDS0VECisgICAgIGNhc2UgQUZfRk9STUFU
 X1MyNF9MRTogcmV0dXJuIEFGTVRfUzI0X1BBQ0tFRDsKKysjZWxpZiBkZWZpbmVkKF9fRnJlZUJT
 RF9fKSAmJiBkZWZpbmVkKEFGTVRfUzI0X0xFKQorKyAgICBjYXNlIEFGX0ZPUk1BVF9VMjRfTEU6
 IHJldHVybiBBRk1UX1UyNF9MRTsKKysgICAgY2FzZSBBRl9GT1JNQVRfVTI0X0JFOiByZXR1cm4g
 QUZNVF9VMjRfQkU7CisrICAgIGNhc2UgQUZfRk9STUFUX1MyNF9MRTogcmV0dXJuIEFGTVRfUzI0
 X0xFOworKyAgICBjYXNlIEFGX0ZPUk1BVF9TMjRfQkU6IHJldHVybiBBRk1UX1MyNF9CRTsKKyAj
 ZW5kaWYKKyAjaWZkZWYgQUZNVF9VMzJfTEUKKyAgICAgY2FzZSBBRl9GT1JNQVRfVTMyX0xFOiBy
 ZXR1cm4gQUZNVF9VMzJfTEU7CitAQCAtMTE1LDYgKzEyMCwxMSBAQCBzdGF0aWMgaW50IG9zczJm
 b3JtYXQoaW50IGZvcm1hdCkKKyAgICAgY2FzZSBBRk1UX1MxNl9CRTogcmV0dXJuIEFGX0ZPUk1B
 VF9TMTZfQkU7CisgI2lmZGVmIEFGTVRfUzI0X1BBQ0tFRAorICAgICBjYXNlIEFGTVRfUzI0X1BB
 Q0tFRDogcmV0dXJuIEFGX0ZPUk1BVF9TMjRfTEU7CisrI2VsaWYgZGVmaW5lZChfX0ZyZWVCU0Rf
 XykgJiYgZGVmaW5lZChBRk1UX1MyNF9MRSkKKysgICAgY2FzZSBBRk1UX1UyNF9MRTogcmV0dXJu
 IEFGX0ZPUk1BVF9VMjRfTEU7CisrICAgIGNhc2UgQUZNVF9VMjRfQkU6IHJldHVybiBBRl9GT1JN
 QVRfVTI0X0JFOworKyAgICBjYXNlIEFGTVRfUzI0X0xFOiByZXR1cm4gQUZfRk9STUFUX1MyNF9M
 RTsKKysgICAgY2FzZSBBRk1UX1MyNF9CRTogcmV0dXJuIEFGX0ZPUk1BVF9TMjRfQkU7CisgI2Vu
 ZGlmCisgI2lmZGVmIEFGTVRfVTMyX0xFCisgICAgIGNhc2UgQUZNVF9VMzJfTEU6IHJldHVybiBB
 Rl9GT1JNQVRfVTMyX0xFOworQEAgLTQ0OCw2ICs0NTgsNyBAQCBzdGF0aWMgdm9pZCByZXNldCh2
 b2lkKXsKICAgIGZjbnRsKGF1ZGlvX2ZkLCBGX1NFVEZELCBGRF9DTE9FWEVDKTsKICAjZW5kaWYK
 ICAKICsgIGlvY3RsIChhdWRpb19mZCwgU05EQ1RMX0RTUF9TUEVFRCwgJmFvX2RhdGEuc2FtcGxl
 cmF0ZSk7CiAgICBvc3NfZm9ybWF0ID0gZm9ybWF0Mm9zcyhhb19kYXRhLmZvcm1hdCk7Ci0gICBp
 Zihhb19kYXRhLmZvcm1hdCA9PSBBRl9GT1JNQVRfQUMzKQorICAgaWYoQUZfRk9STUFUX0lTX0FD
 Myhhb19kYXRhLmZvcm1hdCkpCiAgICAgIGlvY3RsIChhdWRpb19mZCwgU05EQ1RMX0RTUF9TUEVF
 RCwgJmFvX2RhdGEuc2FtcGxlcmF0ZSk7Ci1AQCAtNDY0LDcgKzQ2NSw2IEBACitAQCAtNDU5LDcg
 KzQ3MCw2IEBAIHN0YXRpYyB2b2lkIHJlc2V0KHZvaWQpewogICAgICAgIGludCBjID0gYW9fZGF0
 YS5jaGFubmVscy0xOwogICAgICAgIGlvY3RsIChhdWRpb19mZCwgU05EQ1RMX0RTUF9TVEVSRU8s
 ICZjKTsKICAgICAgfQo=
 --00151744872289fcb704a23bdf27
 Content-Type: application/octet-stream; name=patch-mencoder_1
 Content-Disposition: attachment; filename=patch-mencoder_1
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_gn6d9cng1
 
 ZGlmZiAtcnVOIC0tZXhjbHVkZT1DVlMgL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21lbmNvZGVyLm9y
 aWcvTWFrZWZpbGUgL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21lbmNvZGVyL01ha2VmaWxlCi0tLSAv
 dXNyL3BvcnRzL211bHRpbWVkaWEvbWVuY29kZXIub3JpZy9NYWtlZmlsZQkyMDExLTA0LTAxIDA2
 OjA5OjM2LjAwMDAwMDAwMCAtMDUwMAorKysgL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21lbmNvZGVy
 L01ha2VmaWxlCTIwMTEtMDUtMDEgMTQ6MDc6NTUuMzgwMjA0NTAyIC0wNTAwCkBAIC02LDcgKzYs
 NyBAQAogCiBQT1JUTkFNRT0JbWVuY29kZXIKIFBPUlRWRVJTSU9OPQkke01QTEFZRVJfUE9SVF9W
 RVJTSU9OfQotUE9SVFJFVklTSU9OPQkwCitQT1JUUkVWSVNJT049CTEKIENPTU1FTlQ9CUNvbnZl
 bmllbnQgdmlkZW8gZmlsZSBhbmQgbW92aWUgZW5jb2RlcgogUkVTVFJJQ1RFRD0JUG9ydCBoYXMg
 cmVzdHJpY3RlZCBkZXBlbmRlbmNpZXMKIApAQCAtODQsNiArODQsNyBAQAogCQkJLS1kaXNhYmxl
 LWRpcmVjdGZiIFwKIAkJCS0tZGlzYWJsZS1zc3NlMyBcCiAJCQktLWRpc2FibGUtbXBnMTIzIFwK
 KwkJCS0tZGlzYWJsZS1hbHNhIFwKIAkJCS0tZGlzYWJsZS1tdXNlcGFjawogCiBBTExfVEFSR0VU
 PQltZW5jb2RlcgpAQCAtMTY3LDkgKzE2OCwxMyBAQAogCQkke1dSS1NSQ30vY29uZmlnLm1hawog
 CUAke1JFSU5QTEFDRV9DTUR9IFwKIAkJLWUgJ3MjSEFWRV9GQVNUX0NNT1YgMSNIQVZFX0ZBU1Rf
 Q01PViAwI2cnIFwKKwkJJHtXUktTUkN9L2NvbmZpZy5oCisuaWYgJHtPU1ZFUlNJT059IDwgODAy
 NTAyIHx8ICgke09TVkVSU0lPTn0gPj0gOTAwMDAwICYmICR7T1NWRVJTSU9OfSA8IDkwMDAyNykK
 KwlAJHtSRUlOUExBQ0VfQ01EfSBcCiAJCS1lICdzI0hBVkVfTE9HMiAxI0hBVkVfTE9HMiAwI2cn
 IFwKIAkJLWUgJ3MjSEFWRV9MT0cyRiAxI0hBVkVfTE9HMkYgMCNnJyBcCiAJCSR7V1JLU1JDfS9j
 b25maWcuaAorLmVuZGlmCiAKIGRvLWluc3RhbGw6CiAJQCR7SU5TVEFMTF9QUk9HUkFNfSAke1dS
 S1NSQ30vbWVuY29kZXIgJHtQUkVGSVh9L2Jpbgo=
 --00151744872289fcb704a23bdf27--