20899 2009-07-29 02:11:54 +0400 FFmpeg incompatibility in libmp3lame 2009-07-30 13:44:00 +0400 1 1 4 Development Sisyphus liblame unstable all Linux CLOSED FIXED P3 normal --- 1 naf shrek shrek qa-sisyphus oldest_to_newest 95413 0 3703 naf 2009-07-29 02:11:54 +0400 Created attachment 3703 Patch to fix ffmpeg incompatibility in lame_encode_flush() В версиях LAME 3.98.x (и в текущей 3.98.2-alt1) возникает ошибка в libmp3lame при использовании библиотеки FFmpeg'ом, приводящая к сбоям при перекодировке звука в MP3 с сообщением "libmp3lame: output buffer too small". См. ошибки #803 для FFmpeg (https://roundup.ffmpeg.org/roundup/ffmpeg/issue803) и #2553863 для LAME (http://sourceforge.net/tracker/?func=detail&aid=2553863&group_id=290&atid=100290). Исправление несовместимости с ffmpeg есть в CVS. Патч для 3.98.2 приложен, репозиторий с патчем - http://git.altlinux.org/people/naf/packages/?p=lame.git;a=shortlog;h=refs/heads/ffmpeg-fix 95421 1 repository-robot 2009-07-29 10:25:37 +0400 lame-3.98.2-alt2 -> sisyphus: * Wed Jul 29 2009 Valery Inozemtsev <shrek@altlinux> 3.98.2-alt2 - applied lame-3.98-alt-ffmpeg_fix.patch (closes: #20899) 3703 2009-07-29 02:11:54 +0400 2009-07-29 02:11:54 +0400 Patch to fix ffmpeg incompatibility in lame_encode_flush() lame-3.98-alt-ffmpeg_fix.patch text/plain 6572 naf Q3VtdWxhdGl2ZSBwYXRjaCB0byBmaXggZmZtcGVnIGluY29tcGF0aWJpbGl0eSBpbiBsYW1lX2Vu Y29kZV9mbHVzaCgpCihmb3IgZGV0YWlscyBzZWUgRkZNUEVHIGJ1ZyA4MDM6IGh0dHBzOi8vcm91 bmR1cC5mZm1wZWcub3JnL3JvdW5kdXAvZmZtcGVnL2lzc3VlODAzLCAKIExBTUUgYnVnIDI1NTM4 NjM6IGh0dHA6Ly9zb3VyY2Vmb3JnZS5uZXQvdHJhY2tlci8/ZnVuYz1kZXRhaWwmYWlkPTI1NTM4 NjMmZ3JvdXBfaWQ9MjkwJmF0aWQ9MTAwMjkwKQoKUmV2aXNpb24gMS4zMjMuMi43IChNb24gTWFy IDMwIDE5OjQ4OjAwIDIwMDkgVVRDICBieSByb2JlcnQpCiBlbnN1cmUgd2UgcGFkZCBhdCBsZWFz dCAyODggc2FtcGxlcwoKUmV2aXNpb24gMS4zMjMuMi42IChTdW4gTWFyIDI5IDE0OjQzOjIyIDIw MDkgVVRDICAgYnkgcm9iZXJ0KQogd29ya2Fyb3VuZCBmb3IgRkZNUEVHIGJ1Zywgd2hpY2ggdXNl cyB0byBjYWxsIGxhbWVfZW5jb2RlX2ZsdXNoIG1vcmUgdGhhbiBvbmNlIGluIGxvb3AKClJldmlz aW9uIDEuMzIzLjIuNSAoU2F0IE1hciAyOCAyMjowOTo0NSAyMDA5IFVUQyAgIGJ5IHJvYmVydCkK IGF2b2lkIGV4dHJhIGZyYW1lIGF0IGVuZAoKUmV2aXNpb24gMS4zMjMuMi40IChTdW4gSmFuIDE4 IDE1OjQ0OjI3IDIwMDkgVVRDICAgYnkgcm9iZXJ0KQogcmVwbGFjaW5nIEMrKyBzdHlsZSBjb21t ZW50cyBieSBDIHN0eWxlIGNvbW1lbnRzCgotLS0gLi9saWJtcDNsYW1lL2xhbWUuYwkyMDA5LTA3 LTI4IDE5OjUyOjE3ICswNDAwCisrKyAuL2xpYm1wM2xhbWUvbGFtZS5jCTIwMDktMDMtMzAgMjM6 NDg6MDAgKzA0MDAKQEAgLTE0NzIsNiArMTQ3NiwyNyBAQAogfQogCiAKK3N0YXRpYyBpbnQKK2Nh bGNOZWVkZWQobGFtZV9nbG9iYWxfZmxhZ3MqIGdmcCkKK3sKKyAgICBpbnQgbWZfbmVlZGVkOwor ICAgIC8qIHNvbWUgc2FuaXR5IGNoZWNrcyAqLworI2lmIEVOQ0RFTEFZIDwgTURDVERFTEFZCisj IGVycm9yIEVOQ0RFTEFZIGlzIGxlc3MgdGhhbiBNRENUREVMQVksIHNlZSBlbmNvZGVyLmgKKyNl bmRpZgorI2lmIEZGVE9GRlNFVCA+IEJMS1NJWkUKKyMgZXJyb3IgRkZUT0ZGU0VUIGlzIGdyZWF0 ZXIgdGhhbiBCTEtTSVpFLCBzZWUgZW5jb2Rlci5oCisjZW5kaWYKKworICAgIG1mX25lZWRlZCA9 IEJMS1NJWkUgKyBnZnAtPmZyYW1lc2l6ZSAtIEZGVE9GRlNFVDsgLyogYW1vdW50IG5lZWRlZCBm b3IgRkZUICovCisgICAgLyptZl9uZWVkZWQgPSBNYXgobWZfbmVlZGVkLCAyODYgKyA1NzYgKiAo MSArIGdmYy0+bW9kZV9ncikpOyAqLworICAgIG1mX25lZWRlZCA9IE1heChtZl9uZWVkZWQsIDUx MiArIGdmcC0+ZnJhbWVzaXplIC0gMzIpOworCisgICAgYXNzZXJ0KE1GU0laRSA+PSBtZl9uZWVk ZWQpOworICAgIAorICAgIHJldHVybiBtZl9uZWVkZWQ7Cit9CisKIC8qCiAgKiBUSEUgTUFJTiBM QU1FIEVOQ09ESU5HIElOVEVSRkFDRQogICogbXQgMy8wMApAQCAtMTU1NSwyMCArMTU4MCw3IEBA CiAgICAgICAgIH0KICAgICB9CiAKLQotICAgIC8qIHNvbWUgc2FuaXR5IGNoZWNrcyAqLwotI2lm IEVOQ0RFTEFZIDwgTURDVERFTEFZCi0jIGVycm9yIEVOQ0RFTEFZIGlzIGxlc3MgdGhhbiBNRENU REVMQVksIHNlZSBlbmNvZGVyLmgKLSNlbmRpZgotI2lmIEZGVE9GRlNFVCA+IEJMS1NJWkUKLSMg ZXJyb3IgRkZUT0ZGU0VUIGlzIGdyZWF0ZXIgdGhhbiBCTEtTSVpFLCBzZWUgZW5jb2Rlci5oCi0j ZW5kaWYKLQotICAgIG1mX25lZWRlZCA9IEJMS1NJWkUgKyBnZnAtPmZyYW1lc2l6ZSAtIEZGVE9G RlNFVDsgLyogYW1vdW50IG5lZWRlZCBmb3IgRkZUICovCi0gICAgLyptZl9uZWVkZWQgPSBNYXgo bWZfbmVlZGVkLCAyODYgKyA1NzYgKiAoMSArIGdmYy0+bW9kZV9ncikpOyAqLwotICAgIG1mX25l ZWRlZCA9IE1heChtZl9uZWVkZWQsIDUxMiArIGdmcC0+ZnJhbWVzaXplIC0gMzIpOwotCi0gICAg YXNzZXJ0KE1GU0laRSA+PSBtZl9uZWVkZWQpOworICAgIG1mX25lZWRlZCA9IGNhbGNOZWVkZWQo Z2ZwKTsKIAogICAgIG1mYnVmWzBdID0gZ2ZjLT5tZmJ1ZlswXTsKICAgICBtZmJ1ZlsxXSA9IGdm Yy0+bWZidWZbMV07CkBAIC0xNjAyLDYgKzE2MTQsMTMgQEAKICAgICAgICAgLyogdXBkYXRlIG1m YnVmW10gY291bnRlcnMgKi8KICAgICAgICAgZ2ZjLT5tZl9zaXplICs9IG5fb3V0OwogICAgICAg ICBhc3NlcnQoZ2ZjLT5tZl9zaXplIDw9IE1GU0laRSk7CisKKyAgICAgICAgLyogbGFtZV9lbmNv ZGVfZmx1c2ggbWF5IGhhdmUgc2V0IGdmYy0+bWZfc2FtcGxlX3RvX2VuY29kZSB0byAwCisgICAg ICAgICAqIHNvIHdlIGhhdmUgdG8gcmVpbml0aWFsaXplIGl0IGhlcmUgd2hlbiB0aGF0IGhhcHBl bmVkLgorICAgICAgICAgKi8KKyAgICAgICAgaWYgKGdmYy0+bWZfc2FtcGxlc190b19lbmNvZGUg PCAxKSB7CisgICAgICAgICAgICBnZmMtPm1mX3NhbXBsZXNfdG9fZW5jb2RlID0gRU5DREVMQVkg KyBQT1NUREVMQVk7CisgICAgICAgIH0KICAgICAgICAgZ2ZjLT5tZl9zYW1wbGVzX3RvX2VuY29k ZSArPSBuX291dDsKIAogCkBAIC0xOTI2LDI0ICsxOTQ1LDM2IEBACiAKICAgICAvKiB3ZSBhbHdh eXMgYWRkIFBPU1RERUxBWT0yODggcGFkZGluZyB0byBtYWtlIHN1cmUgZ3JhbnVsZSB3aXRoIHJl YWwKICAgICAgKiBkYXRhIGNhbiBiZSBjb21wbGV0eSBkZWNvZGVkIChiZWNhdXNlIG9mIDUwJSBv dmVybGFwIHdpdGggbmV4dCBncmFudWxlICovCi0gICAgaW50ICAgICBlbmRfcGFkZGluZyA9IFBP U1RERUxBWTsKLSAgICBpbnQgICAgIHBhZF9vdXRfc2FtcGxlczsKKyAgICBpbnQgICAgIGVuZF9w YWRkaW5nOwogICAgIGludCAgICAgZnJhbWVzX2xlZnQ7Ci0gICAgaW50ICAgICBzYW1wbGVzX3Rv X2VuY29kZSA9IGdmYy0+bWZfc2FtcGxlc190b19lbmNvZGU7CisgICAgaW50ICAgICBzYW1wbGVz X3RvX2VuY29kZSA9IGdmYy0+bWZfc2FtcGxlc190b19lbmNvZGUgLSBQT1NUREVMQVkrMjg4Owor ICAgIGludCAgICAgbWZfbmVlZGVkID0gY2FsY05lZWRlZChnZnApOwogCisgICAgLyogV2FzIGZs dXNoIGFscmVhZHkgY2FsbGVkPyAqLworICAgIGlmIChnZmMtPm1mX3NhbXBsZXNfdG9fZW5jb2Rl IDwgMSkgeworICAgICAgICByZXR1cm4gMDsKKyAgICB9CiAgICAgbWVtc2V0KGJ1ZmZlciwgMCwg c2l6ZW9mKGJ1ZmZlcikpOwogICAgIG1wM2NvdW50ID0gMDsKLSAgICAKKwogICAgIGlmIChnZnAt PmluX3NhbXBsZXJhdGUgIT0gZ2ZwLT5vdXRfc2FtcGxlcmF0ZSkgewogICAgICAgICAvKiBkZWxh eSBkdWUgdG8gcmVzYW1wbGluZzsgbmVlZHMgdG8gYmUgZml4ZWQsIGlmIHJlc2FtcGxpbmcgY29k ZSBnZXRzIGNoYW5nZWQgKi8KICAgICAgICAgc2FtcGxlc190b19lbmNvZGUgKz0gMTYuKmdmcC0+ b3V0X3NhbXBsZXJhdGUvZ2ZwLT5pbl9zYW1wbGVyYXRlOwogICAgIH0KLSAgICBwYWRfb3V0X3Nh bXBsZXMgPSBnZnAtPmZyYW1lc2l6ZSAtIChzYW1wbGVzX3RvX2VuY29kZSAlIGdmcC0+ZnJhbWVz aXplKTsKLSAgICBlbmRfcGFkZGluZyArPSBwYWRfb3V0X3NhbXBsZXM7CisgICAgZW5kX3BhZGRp bmcgPSBnZnAtPmZyYW1lc2l6ZSAtIChzYW1wbGVzX3RvX2VuY29kZSAlIGdmcC0+ZnJhbWVzaXpl KTsKKyAgICBnZnAtPmVuY29kZXJfcGFkZGluZyA9IGVuZF9wYWRkaW5nOwogCi0gICAgZnJhbWVz X2xlZnQgPSAoc2FtcGxlc190b19lbmNvZGUgKyBwYWRfb3V0X3NhbXBsZXMpIC8gZ2ZwLT5mcmFt ZXNpemU7Ci0gICAgd2hpbGUgKGZyYW1lc19sZWZ0ID4gMCkgeworICAgIGZyYW1lc19sZWZ0ID0g KHNhbXBsZXNfdG9fZW5jb2RlICsgZW5kX3BhZGRpbmcpIC8gZ2ZwLT5mcmFtZXNpemU7CisKKyAg ICAvKiBzZW5kIGluIGEgZnJhbWUgb2YgMCBwYWRkaW5nIHVudGlsIGFsbCBpbnRlcm5hbCBzYW1w bGUgYnVmZmVycyBhcmUgZmx1c2hlZCAqLworICAgIHdoaWxlIChmcmFtZXNfbGVmdCA+IDAgJiYg aW1wMyA+PSAwKSB7CisgICAgICAgIGludCBidW5jaCA9IG1mX25lZWRlZC1nZmMtPm1mX3NpemU7 CiAgICAgICAgIGludCBmcmFtZV9udW0gPSBnZnAtPmZyYW1lTnVtOworICAgICAgICAKKyAgICAg ICAgYnVuY2ggKj0gZ2ZwLT5pbl9zYW1wbGVyYXRlOworICAgICAgICBidW5jaCAvPSBnZnAtPm91 dF9zYW1wbGVyYXRlOworICAgICAgICBpZiAoYnVuY2ggPiAxMTUyKSBidW5jaCA9IDExNTI7Cisg ICAgICAgIGlmIChidW5jaCA8IDEpIGJ1bmNoID0gMTsKIAogICAgICAgICBtcDNidWZmZXJfc2l6 ZV9yZW1haW5pbmcgPSBtcDNidWZmZXJfc2l6ZSAtIG1wM2NvdW50OwogCkBAIC0xOTUxLDIyICsx OTgyLDIzIEBACiAgICAgICAgIGlmIChtcDNidWZmZXJfc2l6ZSA9PSAwKQogICAgICAgICAgICAg bXAzYnVmZmVyX3NpemVfcmVtYWluaW5nID0gMDsKIAotICAgICAgICAvKiBzZW5kIGluIGEgZnJh bWUgb2YgMCBwYWRkaW5nIHVudGlsIGFsbCBpbnRlcm5hbCBzYW1wbGUgYnVmZmVycwotICAgICAg ICAgKiBhcmUgZmx1c2hlZAotICAgICAgICAgKi8KLSAgICAgICAgaW1wMyA9IGxhbWVfZW5jb2Rl X2J1ZmZlcihnZnAsIGJ1ZmZlclswXSwgYnVmZmVyWzFdLCAzMiwKKyAgICAgICAgaW1wMyA9IGxh bWVfZW5jb2RlX2J1ZmZlcihnZnAsIGJ1ZmZlclswXSwgYnVmZmVyWzFdLCBidW5jaCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtcDNidWZmZXIsIG1wM2J1ZmZlcl9zaXplX3Jl bWFpbmluZyk7CiAgICAgICAgIAotICAgICAgICBpZiAoZnJhbWVfbnVtICE9IGdmcC0+ZnJhbWVO dW0pIHsKLSAgICAgICAgICAgIC0tZnJhbWVzX2xlZnQ7Ci0gICAgICAgIH0KLSAgICAgICAgaWYg KGltcDMgPCAwKSB7Ci0gICAgICAgICAgICAvKiBzb21lIHR5cGUgb2YgZmF0YWwgZXJyb3IgKi8K LSAgICAgICAgICAgIHJldHVybiBpbXAzOwotICAgICAgICB9CiAgICAgICAgIG1wM2J1ZmZlciAr PSBpbXAzOwogICAgICAgICBtcDNjb3VudCArPSBpbXAzOworICAgICAgICBmcmFtZXNfbGVmdCAt PSAoZnJhbWVfbnVtICE9IGdmcC0+ZnJhbWVOdW0pID8gMSA6IDA7CiAgICAgfQorICAgIC8qIFNl dCBnZmMtPm1mX3NhbXBsZXNfdG9fZW5jb2RlIHRvIDAsIHNvIHdlIG1heSBkZXRlY3QKKyAgICAg KiBhbmQgYnJlYWsgbG9vcHMgY2FsbGluZyBpdCBtb3JlIHRoYW4gb25jZSBpbiBhIHJvdy4KKyAg ICAgKi8KKyAgICBnZmMtPm1mX3NhbXBsZXNfdG9fZW5jb2RlID0gMDsKKworICAgIGlmIChpbXAz IDwgMCkgeworICAgICAgICAvKiBzb21lIHR5cGUgb2YgZmF0YWwgZXJyb3IgKi8KKyAgICAgICAg cmV0dXJuIGltcDM7CisgICAgfQorCiAgICAgbXAzYnVmZmVyX3NpemVfcmVtYWluaW5nID0gbXAz YnVmZmVyX3NpemUgLSBtcDNjb3VudDsKICAgICAvKiBpZiB1c2VyIHNwZWNpZmVkIGJ1ZmZlciBz aXplID0gMCwgZG9udCBjaGVjayBzaXplICovCiAgICAgaWYgKG1wM2J1ZmZlcl9zaXplID09IDAp CkBAIC0xOTk3LDcgKzIwMjksNiBAQAogICAgICAgICB9CiAgICAgICAgIG1wM2NvdW50ICs9IGlt cDM7CiAgICAgfQotICAgIGdmcC0+ZW5jb2Rlcl9wYWRkaW5nID0gZW5kX3BhZGRpbmc7CiAjaWYg MAogICAgIHsKICAgICAgICAgaW50IGNvbnN0IGVkID0gZ2ZwLT5lbmNvZGVyX2RlbGF5OwpAQCAt MjAxMSw2ICsyMDQyLDggQEAKICAgICAgICAgTVNHRihnZmMsICJlbmNvZGVyIHBhZGRpbmc9JWRc biIsIGVwKTsKICAgICAgICAgTVNHRihnZmMsICJzYW1wbGUgY291bnQ9JWQgKCVnKVxuIiwgbnMs IGdmcC0+aW5fc2FtcGxlcmF0ZSpkdXJhdGlvbik7CiAgICAgICAgIE1TR0YoZ2ZjLCAiZHVyYXRp b249JWcgc2VjXG4iLCBkdXJhdGlvbik7CisgICAgICAgIE1TR0YoZ2ZjLCAibWZfc2l6ZT0lZFxu IixnZmMtPm1mX3NpemUpOworICAgICAgICBNU0dGKGdmYywgIm1mX3NhbXBsZXNfdG9fZW5jb2Rl PSVkXG4iLGdmYy0+bWZfc2FtcGxlc190b19lbmNvZGUpOwogICAgIH0KICNlbmRpZgogICAgIHJl dHVybiBtcDNjb3VudDsKQEAgLTIwNTIsNyArMjA4NSwxMiBAQAogLyogZmx1c2ggaW50ZXJuYWwg bXAzIGJ1ZmZlcnMsIGFuZCBmcmVlIGludGVybmFsIGJ1ZmZlcnMgICAgICAgICAqLwogLyoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqLwogI2lmIERFUFJFQ0FURURfT1JfT0JTT0xFVEVfQ09ERV9SRU1PVkVECisvKiBPQlNPTEVU RSAqLworaW50IENERUNMCitsYW1lX2VuY29kZV9maW5pc2gobGFtZV9nbG9iYWxfZmxhZ3MgKiBn ZnAsIHVuc2lnbmVkIGNoYXIgKm1wM2J1ZmZlciwgaW50IG1wM2J1ZmZlcl9zaXplKTsKICNlbHNl CisjZW5kaWYKKwogaW50CiBsYW1lX2VuY29kZV9maW5pc2gobGFtZV9nbG9iYWxfZmxhZ3MgKiBn ZnAsIHVuc2lnbmVkIGNoYXIgKm1wM2J1ZmZlciwgaW50IG1wM2J1ZmZlcl9zaXplKQogewpAQCAt MjA2Miw3ICsyMTAwLDYgQEAKIAogICAgIHJldHVybiByZXQ7CiB9Ci0jZW5kaWYKIAogLyoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqLwogLyogd3JpdGUgVkJSIFhpbmcgaGVhZGVyLCBhbmQgSUQzIHZlcnNpb24gMSB0YWcsIGlm IGFza2VkIGZvciAgICAqLwo=