No subject
bogus at does.not.exist.com
bogus at does.not.exist.com
Mon Jul 5 15:10:54 CEST 2010
- Common code used by all code paths
- SDP parsing, used by RTSP and SDP demuxers (grouped into a CONFIG_RTPDEC
item, as in the previous patch set)
- RTSP protocol code
- Code for receiving RTP packets
- RTSP demuxer specific functions + entry points
- SDP demuxer specific functions + entry points
Choosing this approach doesn't exclude future splitting into separate
files, of course, this is just a smaller initial version that is easier to
accept.
With this in place, --disable-everything + --enable-demuxer=rtsp,
--enable-demuxer=sdp or --enable-muxer=rtsp only enable and compile those
parts that actually are needed.
// Martin
---1463810048-1189561312-1287479037=:10000
Content-Type: TEXT/x-diff; name=0001-rtsp-Reorder-functions.patch
Content-Transfer-Encoding: BASE64
Content-ID: <alpine.DEB.2.00.1010191203500.10000 at cone.home.martin.st>
Content-Description:
Content-Disposition: attachment; filename=0001-rtsp-Reorder-functions.patch
RnJvbSA1OTFmODllNmJlZjAyYjZmNzQ4Mzc5NDU5MjI1M2MwMjA0YTA1YmQz
IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogTWFydGluIFN0b3Jz
am8gPG1hcnRpbkBtYXJ0aW4uc3Q+DQpEYXRlOiBUdWUsIDE5IE9jdCAyMDEw
IDExOjEyOjMyICswMzAwDQpTdWJqZWN0OiBbUEFUQ0ggMS8zXSBydHNwOiBS
ZW9yZGVyIGZ1bmN0aW9ucw0KDQotLS0NCiBsaWJhdmZvcm1hdC9ydHNwLmMg
fCAgIDc2ICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0NCiAxIGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlv
bnMoKyksIDM4IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvbGliYXZm
b3JtYXQvcnRzcC5jIGIvbGliYXZmb3JtYXQvcnRzcC5jDQppbmRleCBhZmY3
NDVhLi5mODJmZTNkIDEwMDY0NA0KLS0tIGEvbGliYXZmb3JtYXQvcnRzcC5j
DQorKysgYi9saWJhdmZvcm1hdC9ydHNwLmMNCkBAIC04Nyw2ICs4Nyw0NCBA
QCBzdGF0aWMgdm9pZCBnZXRfd29yZChjaGFyICpidWYsIGludCBidWZfc2l6
ZSwgY29uc3QgY2hhciAqKnBwKQ0KICAgICBnZXRfd29yZF91bnRpbF9jaGFy
cyhidWYsIGJ1Zl9zaXplLCBTUEFDRV9DSEFSUywgcHApOw0KIH0NCiANCisv
KiogUGFyc2UgYSBzdHJpbmcgcCBpbiB0aGUgZm9ybSBvZiBSYW5nZTpucHQ9
eHgteHgsIGFuZCBkZXRlcm1pbmUgdGhlIHN0YXJ0DQorICogIGFuZCBlbmQg
dGltZS4NCisgKiAgVXNlZCBmb3Igc2Vla2luZyBpbiB0aGUgcnRwIHN0cmVh
bS4NCisgKi8NCitzdGF0aWMgdm9pZCBydHNwX3BhcnNlX3JhbmdlX25wdChj
b25zdCBjaGFyICpwLCBpbnQ2NF90ICpzdGFydCwgaW50NjRfdCAqZW5kKQ0K
K3sNCisgICAgY2hhciBidWZbMjU2XTsNCisNCisgICAgcCArPSBzdHJzcG4o
cCwgU1BBQ0VfQ0hBUlMpOw0KKyAgICBpZiAoIWF2X3N0cmlzdGFydChwLCAi
bnB0PSIsICZwKSkNCisgICAgICAgIHJldHVybjsNCisNCisgICAgKnN0YXJ0
ID0gQVZfTk9QVFNfVkFMVUU7DQorICAgICplbmQgPSBBVl9OT1BUU19WQUxV
RTsNCisNCisgICAgZ2V0X3dvcmRfc2VwKGJ1Ziwgc2l6ZW9mKGJ1ZiksICIt
IiwgJnApOw0KKyAgICAqc3RhcnQgPSBwYXJzZV9kYXRlKGJ1ZiwgMSk7DQor
ICAgIGlmICgqcCA9PSAnLScpIHsNCisgICAgICAgIHArKzsNCisgICAgICAg
IGdldF93b3JkX3NlcChidWYsIHNpemVvZihidWYpLCAiLSIsICZwKTsNCisg
ICAgICAgICplbmQgPSBwYXJzZV9kYXRlKGJ1ZiwgMSk7DQorICAgIH0NCisv
LyAgICBhdl9sb2coTlVMTCwgQVZfTE9HX0RFQlVHLCAiUmFuZ2UgU3RhcnQ6
ICVsbGRcbiIsICpzdGFydCk7DQorLy8gICAgYXZfbG9nKE5VTEwsIEFWX0xP
R19ERUJVRywgIlJhbmdlIEVuZDogJWxsZFxuIiwgKmVuZCk7DQorfQ0KKw0K
K3N0YXRpYyBpbnQgZ2V0X3NvY2thZGRyKGNvbnN0IGNoYXIgKmJ1Ziwgc3Ry
dWN0IHNvY2thZGRyX3N0b3JhZ2UgKnNvY2spDQorew0KKyAgICBzdHJ1Y3Qg
YWRkcmluZm8gaGludHMsICphaSA9IE5VTEw7DQorICAgIG1lbXNldCgmaGlu
dHMsIDAsIHNpemVvZihoaW50cykpOw0KKyAgICBoaW50cy5haV9mbGFncyA9
IEFJX05VTUVSSUNIT1NUOw0KKyAgICBpZiAoZ2V0YWRkcmluZm8oYnVmLCBO
VUxMLCAmaGludHMsICZhaSkpDQorICAgICAgICByZXR1cm4gLTE7DQorICAg
IG1lbWNweShzb2NrLCBhaS0+YWlfYWRkciwgRkZNSU4oc2l6ZW9mKCpzb2Nr
KSwgYWktPmFpX2FkZHJsZW4pKTsNCisgICAgZnJlZWFkZHJpbmZvKGFpKTsN
CisgICAgcmV0dXJuIDA7DQorfQ0KKw0KIC8qIHBhcnNlIHRoZSBydHBtYXAg
ZGVzY3JpcHRpb246IDxjb2RlY19uYW1lPi88Y2xvY2tfcmF0ZT5bLzxvdGhl
ciBwYXJhbXM+XSAqLw0KIHN0YXRpYyBpbnQgc2RwX3BhcnNlX3J0cG1hcChB
VkZvcm1hdENvbnRleHQgKnMsDQogICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIEFWQ29kZWNDb250ZXh0ICpjb2RlYywgUlRTUFN0cmVhbSAqcnRzcF9z
dCwNCkBAIC0xODYsNDQgKzIyNCw2IEBAIGludCBmZl9ydHNwX25leHRfYXR0
cl9hbmRfdmFsdWUoY29uc3QgY2hhciAqKnAsIGNoYXIgKmF0dHIsIGludCBh
dHRyX3NpemUsDQogICAgIHJldHVybiAwOw0KIH0NCiANCi0vKiogUGFyc2Ug
YSBzdHJpbmcgcCBpbiB0aGUgZm9ybSBvZiBSYW5nZTpucHQ9eHgteHgsIGFu
ZCBkZXRlcm1pbmUgdGhlIHN0YXJ0DQotICogIGFuZCBlbmQgdGltZS4NCi0g
KiAgVXNlZCBmb3Igc2Vla2luZyBpbiB0aGUgcnRwIHN0cmVhbS4NCi0gKi8N
Ci1zdGF0aWMgdm9pZCBydHNwX3BhcnNlX3JhbmdlX25wdChjb25zdCBjaGFy
ICpwLCBpbnQ2NF90ICpzdGFydCwgaW50NjRfdCAqZW5kKQ0KLXsNCi0gICAg
Y2hhciBidWZbMjU2XTsNCi0NCi0gICAgcCArPSBzdHJzcG4ocCwgU1BBQ0Vf
Q0hBUlMpOw0KLSAgICBpZiAoIWF2X3N0cmlzdGFydChwLCAibnB0PSIsICZw
KSkNCi0gICAgICAgIHJldHVybjsNCi0NCi0gICAgKnN0YXJ0ID0gQVZfTk9Q
VFNfVkFMVUU7DQotICAgICplbmQgPSBBVl9OT1BUU19WQUxVRTsNCi0NCi0g
ICAgZ2V0X3dvcmRfc2VwKGJ1Ziwgc2l6ZW9mKGJ1ZiksICItIiwgJnApOw0K
LSAgICAqc3RhcnQgPSBwYXJzZV9kYXRlKGJ1ZiwgMSk7DQotICAgIGlmICgq
cCA9PSAnLScpIHsNCi0gICAgICAgIHArKzsNCi0gICAgICAgIGdldF93b3Jk
X3NlcChidWYsIHNpemVvZihidWYpLCAiLSIsICZwKTsNCi0gICAgICAgICpl
bmQgPSBwYXJzZV9kYXRlKGJ1ZiwgMSk7DQotICAgIH0NCi0vLyAgICBhdl9s
b2coTlVMTCwgQVZfTE9HX0RFQlVHLCAiUmFuZ2UgU3RhcnQ6ICVsbGRcbiIs
ICpzdGFydCk7DQotLy8gICAgYXZfbG9nKE5VTEwsIEFWX0xPR19ERUJVRywg
IlJhbmdlIEVuZDogJWxsZFxuIiwgKmVuZCk7DQotfQ0KLQ0KLXN0YXRpYyBp
bnQgZ2V0X3NvY2thZGRyKGNvbnN0IGNoYXIgKmJ1Ziwgc3RydWN0IHNvY2th
ZGRyX3N0b3JhZ2UgKnNvY2spDQotew0KLSAgICBzdHJ1Y3QgYWRkcmluZm8g
aGludHMsICphaSA9IE5VTEw7DQotICAgIG1lbXNldCgmaGludHMsIDAsIHNp
emVvZihoaW50cykpOw0KLSAgICBoaW50cy5haV9mbGFncyA9IEFJX05VTUVS
SUNIT1NUOw0KLSAgICBpZiAoZ2V0YWRkcmluZm8oYnVmLCBOVUxMLCAmaGlu
dHMsICZhaSkpDQotICAgICAgICByZXR1cm4gLTE7DQotICAgIG1lbWNweShz
b2NrLCBhaS0+YWlfYWRkciwgRkZNSU4oc2l6ZW9mKCpzb2NrKSwgYWktPmFp
X2FkZHJsZW4pKTsNCi0gICAgZnJlZWFkZHJpbmZvKGFpKTsNCi0gICAgcmV0
dXJuIDA7DQotfQ0KLQ0KIHR5cGVkZWYgc3RydWN0IFNEUFBhcnNlU3RhdGUg
ew0KICAgICAvKiBTRFAgb25seSAqLw0KICAgICBzdHJ1Y3Qgc29ja2FkZHJf
c3RvcmFnZSBkZWZhdWx0X2lwOw0KLS0gDQoxLjcuMy4xDQoNCg==
---1463810048-1189561312-1287479037=:10000
Content-Type: TEXT/x-diff; name=0002-rtsp-Untangle-the-dependencies-between-the-RTSP-SDP-.patch
Content-Transfer-Encoding: BASE64
Content-ID: <alpine.DEB.2.00.1010191203501.10000 at cone.home.martin.st>
Content-Description:
Content-Disposition: attachment; filename=0002-rtsp-Untangle-the-dependencies-between-the-RTSP-SDP-.patch
RnJvbSBjMmIxODg1NjNjMzdiYzkzNjQ2YTZkNWE0OWE2NWQzYzVlOTA1Y2I5
IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogTWFydGluIFN0b3Jz
am8gPG1hcnRpbkBtYXJ0aW4uc3Q+DQpEYXRlOiBUdWUsIDE5IE9jdCAyMDEw
IDExOjM5OjExICswMzAwDQpTdWJqZWN0OiBbUEFUQ0ggMi8zXSBydHNwOiBV
bnRhbmdsZSB0aGUgZGVwZW5kZW5jaWVzIGJldHdlZW4gdGhlIFJUU1AvU0RQ
IGRlbXV4ZXJzIGFuZCBSVFNQIG11eGVyDQoNCi0tLQ0KIGNvbmZpZ3VyZSAg
ICAgICAgICAgICAgICB8ICAgIDggKysrKystLS0NCiBsaWJhdmZvcm1hdC9N
YWtlZmlsZSAgICAgfCAgIDEwICsrKysrLS0tLS0NCiBsaWJhdmZvcm1hdC9h
bGxmb3JtYXRzLmMgfCAgICAyICstDQogbGliYXZmb3JtYXQvcnRzcC5jICAg
ICAgIHwgICAzMyArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0N
CiA0IGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDE5IGRlbGV0
aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmlndXJl
DQppbmRleCBkNzI1OTQyLi5hYmQ1OTllIDEwMDc1NQ0KLS0tIGEvY29uZmln
dXJlDQorKysgYi9jb25maWd1cmUNCkBAIC05MTIsNiArOTEyLDcgQEAgQ09O
RklHX0xJU1Q9Ig0KICAgICBwaWMNCiAgICAgcG9zdHByb2MNCiAgICAgcmRm
dA0KKyAgICBydHBkZWMNCiAgICAgcnVudGltZV9jcHVkZXRlY3QNCiAgICAg
c2hhcmVkDQogICAgIHNtYWxsDQpAQCAtMTM2MiwxMSArMTM2MywxMiBAQCBt
eGZfZDEwX211eGVyX3NlbGVjdD0ibXhmX211eGVyIg0KIG9nZ19kZW11eGVy
X3NlbGVjdD0iZ29sb21iIg0KIHBzcF9tdXhlcl9zZWxlY3Q9Im1vdl9tdXhl
ciINCiBydHBfZGVtdXhlcl9zZWxlY3Q9InNkcF9kZW11eGVyIg0KLXJ0c3Bf
ZGVtdXhlcl9zZWxlY3Q9Imh0dHBfcHJvdG9jb2wgc2RwX2RlbXV4ZXIiDQot
cnRzcF9tdXhlcl9zZWxlY3Q9InJ0cF9tdXhlciBodHRwX3Byb3RvY29sIHNk
cF9kZW11eGVyIg0KK3J0cGRlY19zZWxlY3Q9ImFzZl9kZW11eGVyIHJtX2Rl
bXV4ZXIgcnRwX3Byb3RvY29sIG1wZWd0c19kZW11eGVyIG1vdl9kZW11eGVy
Ig0KK3J0c3BfZGVtdXhlcl9zZWxlY3Q9Imh0dHBfcHJvdG9jb2wgcnRwZGVj
Ig0KK3J0c3BfbXV4ZXJfc2VsZWN0PSJydHBfbXV4ZXIgaHR0cF9wcm90b2Nv
bCBydHBfcHJvdG9jb2wiDQogc2FwX2RlbXV4ZXJfc2VsZWN0PSJzZHBfZGVt
dXhlciINCiBzYXBfbXV4ZXJfc2VsZWN0PSJydHBfbXV4ZXIgcnRwX3Byb3Rv
Y29sIg0KLXNkcF9kZW11eGVyX3NlbGVjdD0iYXNmX2RlbXV4ZXIgcm1fZGVt
dXhlciBydHBfcHJvdG9jb2wgbXBlZ3RzX2RlbXV4ZXIgbW92X2RlbXV4ZXIi
DQorc2RwX2RlbXV4ZXJfc2VsZWN0PSJydHBkZWMiDQogc3BkaWZfbXV4ZXJf
c2VsZWN0PSJhYWNfcGFyc2VyIg0KIHRnMl9tdXhlcl9zZWxlY3Q9Im1vdl9t
dXhlciINCiB0Z3BfbXV4ZXJfc2VsZWN0PSJtb3ZfbXV4ZXIiDQpkaWZmIC0t
Z2l0IGEvbGliYXZmb3JtYXQvTWFrZWZpbGUgYi9saWJhdmZvcm1hdC9NYWtl
ZmlsZQ0KaW5kZXggMmJhOGIwOS4uNTY1NTBkYyAxMDA2NDQNCi0tLSBhL2xp
YmF2Zm9ybWF0L01ha2VmaWxlDQorKysgYi9saWJhdmZvcm1hdC9NYWtlZmls
ZQ0KQEAgLTIzMCwxMSArMjMwLDExIEBAIE9CSlMtJChDT05GSUdfUlRQX01V
WEVSKSAgICAgICAgICAgICAgICAgKz0gcnRwLm8gICAgICAgICBcDQogICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBydHBl
bmNfeGlwaC5vIFwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIGF2Yy5vDQogT0JKUy0kKENPTkZJR19SVFNQX0RFTVVY
RVIpICAgICAgICAgICAgICArPSBydHNwLm8gaHR0cGF1dGgubw0KLU9CSlMt
JChDT05GSUdfUlRTUF9NVVhFUikgICAgICAgICAgICAgICAgKz0gcnRzcC5v
IHJ0c3BlbmMubyBodHRwYXV0aC5vDQorT0JKUy0kKENPTkZJR19SVFNQX01V
WEVSKSAgICAgICAgICAgICAgICArPSBydHNwLm8gcnRzcGVuYy5vIGh0dHBh
dXRoLm8gXA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgcnRwZW5jX2NoYWluLm8NCiBPQkpTLSQoQ09ORklHX1NBUF9E
RU1VWEVSKSAgICAgICAgICAgICAgICs9IHNhcGRlYy5vDQogT0JKUy0kKENP
TkZJR19TQVBfTVVYRVIpICAgICAgICAgICAgICAgICArPSBzYXBlbmMubyBy
dHBlbmNfY2hhaW4ubw0KLU9CSlMtJChDT05GSUdfU0RQX0RFTVVYRVIpICAg
ICAgICAgICAgICAgKz0gcnRzcC5vICAgICAgICBcDQotICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZHQubyAgICAgICAg
IFwNCitPQkpTLSQoQ09ORklHX1JUUERFQykgICAgICAgICAgICAgICAgICAg
ICs9IHJkdC5vICAgICAgICAgXA0KICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgcnRwLm8gICAgICAgICBcDQogICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBydHBkZWMu
byAgICAgIFwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIHJ0cGRlY19hbXIubyAgXA0KQEAgLTI0Nyw4ICsyNDcsOCBA
QCBPQkpTLSQoQ09ORklHX1NEUF9ERU1VWEVSKSAgICAgICAgICAgICAgICs9
IHJ0c3AubyAgICAgICAgXA0KICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgcnRwZGVjX3F0Lm8gICBcDQogICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBydHBkZWNfc3Zx
My5vIFwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIHJ0cGRlY192cDgubyAgXA0KLSAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgcnRwZGVjX3hpcGgubyBcDQotICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBydHBl
bmNfY2hhaW4ubw0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgcnRwZGVjX3hpcGgubw0KK09CSlMtJChDT05GSUdfU0RQ
X0RFTVVYRVIpICAgICAgICAgICAgICAgKz0gcnRzcC5vDQogT0JKUy0kKENP
TkZJR19TRUdBRklMTV9ERU1VWEVSKSAgICAgICAgICArPSBzZWdhZmlsbS5v
DQogT0JKUy0kKENPTkZJR19TSE9SVEVOX0RFTVVYRVIpICAgICAgICAgICAr
PSByYXdkZWMubw0KIE9CSlMtJChDT05GSUdfU0lGRl9ERU1VWEVSKSAgICAg
ICAgICAgICAgKz0gc2lmZi5vDQpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQv
YWxsZm9ybWF0cy5jIGIvbGliYXZmb3JtYXQvYWxsZm9ybWF0cy5jDQppbmRl
eCA5ZjMzZTMxLi5lMzVmNGY4IDEwMDY0NA0KLS0tIGEvbGliYXZmb3JtYXQv
YWxsZm9ybWF0cy5jDQorKysgYi9saWJhdmZvcm1hdC9hbGxmb3JtYXRzLmMN
CkBAIC0xODMsNyArMTgzLDcgQEAgdm9pZCBhdl9yZWdpc3Rlcl9hbGwodm9p
ZCkNCiAgICAgUkVHSVNURVJfTVVYREVNVVggKFJUU1AsIHJ0c3ApOw0KICAg
ICBSRUdJU1RFUl9NVVhERU1VWCAoU0FQLCBzYXApOw0KICAgICBSRUdJU1RF
Ul9ERU1VWEVSICAoU0RQLCBzZHApOw0KLSNpZiBDT05GSUdfU0RQX0RFTVVY
RVINCisjaWYgQ09ORklHX1JUUERFQw0KICAgICBhdl9yZWdpc3Rlcl9ydHBf
ZHluYW1pY19wYXlsb2FkX2hhbmRsZXJzKCk7DQogICAgIGF2X3JlZ2lzdGVy
X3JkdF9keW5hbWljX3BheWxvYWRfaGFuZGxlcnMoKTsNCiAjZW5kaWYNCmRp
ZmYgLS1naXQgYS9saWJhdmZvcm1hdC9ydHNwLmMgYi9saWJhdmZvcm1hdC9y
dHNwLmMNCmluZGV4IGY4MmZlM2QuLjg2MjJjYjIgMTAwNjQ0DQotLS0gYS9s
aWJhdmZvcm1hdC9ydHNwLmMNCisrKyBiL2xpYmF2Zm9ybWF0L3J0c3AuYw0K
QEAgLTEyNSw2ICsxMjUsNyBAQCBzdGF0aWMgaW50IGdldF9zb2NrYWRkcihj
b25zdCBjaGFyICpidWYsIHN0cnVjdCBzb2NrYWRkcl9zdG9yYWdlICpzb2Nr
KQ0KICAgICByZXR1cm4gMDsNCiB9DQogDQorI2lmIENPTkZJR19SVFBERUMN
CiAvKiBwYXJzZSB0aGUgcnRwbWFwIGRlc2NyaXB0aW9uOiA8Y29kZWNfbmFt
ZT4vPGNsb2NrX3JhdGU+Wy88b3RoZXIgcGFyYW1zPl0gKi8NCiBzdGF0aWMg
aW50IHNkcF9wYXJzZV9ydHBtYXAoQVZGb3JtYXRDb250ZXh0ICpzLA0KICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICBBVkNvZGVjQ29udGV4dCAqY29k
ZWMsIFJUU1BTdHJlYW0gKnJ0c3Bfc3QsDQpAQCAtNDU3LDYgKzQ1OCw3IEBA
IHN0YXRpYyBpbnQgc2RwX3BhcnNlKEFWRm9ybWF0Q29udGV4dCAqcywgY29u
c3QgY2hhciAqY29udGVudCkNCiAgICAgfQ0KICAgICByZXR1cm4gMDsNCiB9
DQorI2VuZGlmIC8qIENPTkZJR19SVFBERUMgKi8NCiANCiAvKiBjbG9zZSBh
bmQgZnJlZSBSVFNQIHN0cmVhbXMgKi8NCiB2b2lkIGZmX3J0c3BfY2xvc2Vf
c3RyZWFtcyhBVkZvcm1hdENvbnRleHQgKnMpDQpAQCAtNDgzLDkgKzQ4NSw5
IEBAIHZvaWQgZmZfcnRzcF9jbG9zZV9zdHJlYW1zKEFWRm9ybWF0Q29udGV4
dCAqcykNCiAgICAgICAgICAgICAgICAgICAgIGF2X21ldGFkYXRhX2ZyZWUo
JnJ0cGN0eC0+bWV0YWRhdGEpOw0KICAgICAgICAgICAgICAgICAgICAgYXZf
ZnJlZShydHBjdHgtPnN0cmVhbXNbMF0pOw0KICAgICAgICAgICAgICAgICAg
ICAgYXZfZnJlZShydHBjdHgpOw0KLSAgICAgICAgICAgICAgICB9IGVsc2Ug
aWYgKHJ0LT50cmFuc3BvcnQgPT0gUlRTUF9UUkFOU1BPUlRfUkRUKQ0KKyAg
ICAgICAgICAgICAgICB9IGVsc2UgaWYgKHJ0LT50cmFuc3BvcnQgPT0gUlRT
UF9UUkFOU1BPUlRfUkRUICYmIENPTkZJR19SVFBERUMpDQogICAgICAgICAg
ICAgICAgICAgICBmZl9yZHRfcGFyc2VfY2xvc2UocnRzcF9zdC0+dHJhbnNw
b3J0X3ByaXYpOw0KLSAgICAgICAgICAgICAgICBlbHNlDQorICAgICAgICAg
ICAgICAgIGVsc2UgaWYgKENPTkZJR19SVFBERUMpDQogICAgICAgICAgICAg
ICAgICAgICBydHBfcGFyc2VfY2xvc2UocnRzcF9zdC0+dHJhbnNwb3J0X3By
aXYpOw0KICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICBpZiAocnRzcF9z
dC0+cnRwX2hhbmRsZSkNCkBAIC01MTQsMTcgKzUxNiwxNyBAQCBzdGF0aWMg
aW50IHJ0c3Bfb3Blbl90cmFuc3BvcnRfY3R4KEFWRm9ybWF0Q29udGV4dCAq
cywgUlRTUFN0cmVhbSAqcnRzcF9zdCkNCiAgICAgaWYgKCFzdCkNCiAgICAg
ICAgIHMtPmN0eF9mbGFncyB8PSBBVkZNVENUWF9OT0hFQURFUjsNCiANCi0g
ICAgaWYgKHMtPm9mb3JtYXQpIHsNCisgICAgaWYgKHMtPm9mb3JtYXQgJiYg
Q09ORklHX1JUU1BfTVVYRVIpIHsNCiAgICAgICAgIHJ0c3Bfc3QtPnRyYW5z
cG9ydF9wcml2ID0gZmZfcnRwX2NoYWluX211eF9vcGVuKHMsIHN0LA0KICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnRzcF9zdC0+
cnRwX2hhbmRsZSwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIFJUU1BfVENQX01BWF9QQUNLRVRfU0laRSk7DQogICAgICAgICAv
KiBPd25lcnNoaXAgb2YgcnRwX2hhbmRsZSBpcyBwYXNzZWQgdG8gdGhlIHJ0
cCBtdXggY29udGV4dCAqLw0KICAgICAgICAgcnRzcF9zdC0+cnRwX2hhbmRs
ZSA9IE5VTEw7DQotICAgIH0gZWxzZSBpZiAocnQtPnRyYW5zcG9ydCA9PSBS
VFNQX1RSQU5TUE9SVF9SRFQpDQorICAgIH0gZWxzZSBpZiAocnQtPnRyYW5z
cG9ydCA9PSBSVFNQX1RSQU5TUE9SVF9SRFQgJiYgQ09ORklHX1JUUERFQykN
CiAgICAgICAgIHJ0c3Bfc3QtPnRyYW5zcG9ydF9wcml2ID0gZmZfcmR0X3Bh
cnNlX29wZW4ocywgc3QtPmluZGV4LA0KICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgcnRzcF9zdC0+ZHluYW1pY19wcm90
b2NvbF9jb250ZXh0LA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgcnRzcF9zdC0+ZHluYW1pY19oYW5kbGVyKTsNCi0g
ICAgZWxzZQ0KKyAgICBlbHNlIGlmIChDT05GSUdfUlRQREVDKQ0KICAgICAg
ICAgcnRzcF9zdC0+dHJhbnNwb3J0X3ByaXYgPSBydHBfcGFyc2Vfb3Blbihz
LCBzdCwgcnRzcF9zdC0+cnRwX2hhbmRsZSwNCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgIHJ0c3Bfc3QtPnNkcF9wYXlsb2Fk
X3R5cGUsDQogICAgICAgICAgICAgKHJ0LT5sb3dlcl90cmFuc3BvcnQgPT0g
UlRTUF9MT1dFUl9UUkFOU1BPUlRfVENQIHx8ICFzLT5tYXhfZGVsYXkpDQpA
QCAtNTMyLDcgKzUzNCw3IEBAIHN0YXRpYyBpbnQgcnRzcF9vcGVuX3RyYW5z
cG9ydF9jdHgoQVZGb3JtYXRDb250ZXh0ICpzLCBSVFNQU3RyZWFtICpydHNw
X3N0KQ0KIA0KICAgICBpZiAoIXJ0c3Bfc3QtPnRyYW5zcG9ydF9wcml2KSB7
DQogICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsNCi0gICAgfSBl
bHNlIGlmIChydC0+dHJhbnNwb3J0ICE9IFJUU1BfVFJBTlNQT1JUX1JEVCkg
ew0KKyAgICB9IGVsc2UgaWYgKHJ0LT50cmFuc3BvcnQgIT0gUlRTUF9UUkFO
U1BPUlRfUkRUICYmIENPTkZJR19SVFBERUMpIHsNCiAgICAgICAgIGlmIChy
dHNwX3N0LT5keW5hbWljX2hhbmRsZXIpIHsNCiAgICAgICAgICAgICBydHBf
cGFyc2Vfc2V0X2R5bmFtaWNfcHJvdG9jb2wocnRzcF9zdC0+dHJhbnNwb3J0
X3ByaXYsDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIHJ0c3Bfc3QtPmR5bmFtaWNfcHJvdG9jb2xfY29udGV4dCwNCkBA
IC0xMDY4LDcgKzEwNzAsNyBAQCBzdGF0aWMgaW50IG1ha2Vfc2V0dXBfcmVx
dWVzdChBVkZvcm1hdENvbnRleHQgKnMsIGNvbnN0IGNoYXIgKmhvc3QsIGlu
dCBwb3J0LA0KICAgICAgICAgc25wcmludGYoY21kLCBzaXplb2YoY21kKSwN
CiAgICAgICAgICAgICAgICAgICJUcmFuc3BvcnQ6ICVzXHJcbiIsDQogICAg
ICAgICAgICAgICAgICB0cmFuc3BvcnQpOw0KLSAgICAgICAgaWYgKGkgPT0g
MCAmJiBydC0+c2VydmVyX3R5cGUgPT0gUlRTUF9TRVJWRVJfUkVBTCkgew0K
KyAgICAgICAgaWYgKGkgPT0gMCAmJiBydC0+c2VydmVyX3R5cGUgPT0gUlRT
UF9TRVJWRVJfUkVBTCAmJiBDT05GSUdfUlRQREVDKSB7DQogICAgICAgICAg
ICAgY2hhciByZWFsX3Jlc1s0MV0sIHJlYWxfY3N1bVs5XTsNCiAgICAgICAg
ICAgICBmZl9yZHRfY2FsY19yZXNwb25zZV9hbmRfY2hlY2tzdW0ocmVhbF9y
ZXMsIHJlYWxfY3N1bSwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgcmVhbF9jaGFsbGVuZ2UpOw0KQEAgLTExMzMs
NyArMTEzNSw4IEBAIHN0YXRpYyBpbnQgbWFrZV9zZXR1cF9yZXF1ZXN0KEFW
Rm9ybWF0Q29udGV4dCAqcywgY29uc3QgY2hhciAqaG9zdCwgaW50IHBvcnQs
DQogICAgICAgICAgICAgICogcG90ZW50aWFsIE5BVCByb3V0ZXIgYnkgc2Vu
ZGluZyBkdW1teSBwYWNrZXRzLg0KICAgICAgICAgICAgICAqIFJUUC9SVENQ
IGR1bW15IHBhY2tldHMgYXJlIHVzZWQgZm9yIFJEVCwgdG9vLg0KICAgICAg
ICAgICAgICAqLw0KLSAgICAgICAgICAgIGlmICghKHJ0LT5zZXJ2ZXJfdHlw
ZSA9PSBSVFNQX1NFUlZFUl9XTVMgJiYgaSA+IDEpICYmIHMtPmlmb3JtYXQp
DQorICAgICAgICAgICAgaWYgKCEocnQtPnNlcnZlcl90eXBlID09IFJUU1Bf
U0VSVkVSX1dNUyAmJiBpID4gMSkgJiYgcy0+aWZvcm1hdCAmJg0KKyAgICAg
ICAgICAgICAgICBDT05GSUdfUlRQREVDKQ0KICAgICAgICAgICAgICAgICBy
dHBfc2VuZF9wdW5jaF9wYWNrZXRzKHJ0c3Bfc3QtPnJ0cF9oYW5kbGUpOw0K
ICAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICAgfQ0KQEAgLTEyMzIsNiAr
MTIzNSw3IEBAIHN0YXRpYyBpbnQgcnRzcF9yZWFkX3BsYXkoQVZGb3JtYXRD
b250ZXh0ICpzKQ0KICAgICByZXR1cm4gMDsNCiB9DQogDQorI2lmIENPTkZJ
R19SVFNQX0RFTVVYRVINCiBzdGF0aWMgaW50IHJ0c3Bfc2V0dXBfaW5wdXRf
c3RyZWFtcyhBVkZvcm1hdENvbnRleHQgKnMsIFJUU1BNZXNzYWdlSGVhZGVy
ICpyZXBseSkNCiB7DQogICAgIFJUU1BTdGF0ZSAqcnQgPSBzLT5wcml2X2Rh
dGE7DQpAQCAtMTI2OCw3ICsxMjcyLDkgQEAgc3RhdGljIGludCBydHNwX3Nl
dHVwX2lucHV0X3N0cmVhbXMoQVZGb3JtYXRDb250ZXh0ICpzLCBSVFNQTWVz
c2FnZUhlYWRlciAqcmVwbHkNCiANCiAgICAgcmV0dXJuIDA7DQogfQ0KKyNl
bmRpZiAvKiBDT05GSUdfUlRTUF9ERU1VWEVSICovDQogDQorI2lmIENPTkZJ
R19SVFNQX01VWEVSDQogc3RhdGljIGludCBydHNwX3NldHVwX291dHB1dF9z
dHJlYW1zKEFWRm9ybWF0Q29udGV4dCAqcywgY29uc3QgY2hhciAqYWRkcikN
CiB7DQogICAgIFJUU1BTdGF0ZSAqcnQgPSBzLT5wcml2X2RhdGE7DQpAQCAt
MTMzMiw2ICsxMzM4LDcgQEAgc3RhdGljIGludCBydHNwX3NldHVwX291dHB1
dF9zdHJlYW1zKEFWRm9ybWF0Q29udGV4dCAqcywgY29uc3QgY2hhciAqYWRk
cikNCiANCiAgICAgcmV0dXJuIDA7DQogfQ0KKyNlbmRpZiAvKiBDT05GSUdf
UlRTUF9NVVhFUiAqLw0KIA0KIHZvaWQgZmZfcnRzcF9jbG9zZV9jb25uZWN0
aW9ucyhBVkZvcm1hdENvbnRleHQgKnMpDQogew0KQEAgLTE1NDgsOSArMTU1
NSw5IEBAIHJlZGlyZWN0Og0KICAgICAgICAgYnJlYWs7DQogICAgIH0NCiAN
Ci0gICAgaWYgKHMtPmlmb3JtYXQpDQorICAgIGlmIChzLT5pZm9ybWF0ICYm
IENPTkZJR19SVFNQX0RFTVVYRVIpDQogICAgICAgICBlcnIgPSBydHNwX3Nl
dHVwX2lucHV0X3N0cmVhbXMocywgcmVwbHkpOw0KLSAgICBlbHNlDQorICAg
IGVsc2UgaWYgKENPTkZJR19SVFNQX01VWEVSKQ0KICAgICAgICAgZXJyID0g
cnRzcF9zZXR1cF9vdXRwdXRfc3RyZWFtcyhzLCBob3N0KTsNCiAgICAgaWYg
KGVycikNCiAgICAgICAgIGdvdG8gZmFpbDsNCkBAIC0xNTg5LDYgKzE1OTYs
NyBAQCByZWRpcmVjdDoNCiB9DQogI2VuZGlmIC8qIENPTkZJR19SVFNQX0RF
TVVYRVIgfHwgQ09ORklHX1JUU1BfTVVYRVIgKi8NCiANCisjaWYgQ09ORklH
X1JUUERFQw0KIHN0YXRpYyBpbnQgdWRwX3JlYWRfcGFja2V0KEFWRm9ybWF0
Q29udGV4dCAqcywgUlRTUFN0cmVhbSAqKnBydHNwX3N0LA0KICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIHVpbnQ4X3QgKmJ1ZiwgaW50IGJ1Zl9zaXpl
LCBpbnQ2NF90IHdhaXRfZW5kKQ0KIHsNCkBAIC0xNzc3LDYgKzE3ODUsNyBA
QCBlbmQ6DQogDQogICAgIHJldHVybiByZXQ7DQogfQ0KKyNlbmRpZiAvKiBD
T05GSUdfUlRQREVDICovDQogDQogI2lmIENPTkZJR19SVFNQX0RFTVVYRVIN
CiBzdGF0aWMgaW50IHJ0c3BfcmVhZF9oZWFkZXIoQVZGb3JtYXRDb250ZXh0
ICpzLA0KQEAgLTIwMjAsNiArMjAyOSw3IEBAIEFWSW5wdXRGb3JtYXQgcnRz
cF9kZW11eGVyID0gew0KIH07DQogI2VuZGlmIC8qIENPTkZJR19SVFNQX0RF
TVVYRVIgKi8NCiANCisjaWYgQ09ORklHX1NEUF9ERU1VWEVSDQogc3RhdGlj
IGludCBzZHBfcHJvYmUoQVZQcm9iZURhdGEgKnAxKQ0KIHsNCiAgICAgY29u
c3QgY2hhciAqcCA9IHAxLT5idWYsICpwX2VuZCA9IHAxLT5idWYgKyBwMS0+
YnVmX3NpemU7DQpAQCAtMjEwNCw3ICsyMTE0LDkgQEAgQVZJbnB1dEZvcm1h
dCBzZHBfZGVtdXhlciA9IHsNCiAgICAgcnRzcF9mZXRjaF9wYWNrZXQsDQog
ICAgIHNkcF9yZWFkX2Nsb3NlLA0KIH07DQorI2VuZGlmIC8qIENPTkZJR19T
RFBfREVNVVhFUiAqLw0KIA0KKyNpZiBDT05GSUdfUlRQX0RFTVVYRVINCiBz
dGF0aWMgaW50IHJ0cF9wcm9iZShBVlByb2JlRGF0YSAqcCkNCiB7DQogICAg
IGlmIChhdl9zdHJzdGFydChwLT5maWxlbmFtZSwgInJ0cDoiLCBOVUxMKSkN
CkBAIC0yMjA3LDQgKzIyMTksNSBAQCBBVklucHV0Rm9ybWF0IHJ0cF9kZW11
eGVyID0gew0KICAgICBzZHBfcmVhZF9jbG9zZSwNCiAgICAgLmZsYWdzID0g
QVZGTVRfTk9GSUxFLA0KIH07DQorI2VuZGlmIC8qIENPTkZJR19SVFBfREVN
VVhFUiAqLw0KIA0KLS0gDQoxLjcuMy4xDQoNCg==
---1463810048-1189561312-1287479037=:10000
Content-Type: TEXT/x-diff; name=0003-Restore-alphabetical-order.patch
Content-Transfer-Encoding: BASE64
Content-ID: <alpine.DEB.2.00.1010191203502.10000 at cone.home.martin.st>
Content-Description:
Content-Disposition: attachment; filename=0003-Restore-alphabetical-order.patch
RnJvbSBiM2Q3YTEwNGE5YzhlMWZmZjI3N2FmYmU4ZTUzZTdlNjNiNjk3ZTIx
IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogTWFydGluIFN0b3Jz
am8gPG1hcnRpbkBtYXJ0aW4uc3Q+DQpEYXRlOiBUdWUsIDE5IE9jdCAyMDEw
IDExOjQwOjM0ICswMzAwDQpTdWJqZWN0OiBbUEFUQ0ggMy8zXSBSZXN0b3Jl
IGFscGhhYmV0aWNhbCBvcmRlcg0KDQotLS0NCiBsaWJhdmZvcm1hdC9NYWtl
ZmlsZSB8ICAgMTAgKysrKystLS0tLQ0KIDEgZmlsZXMgY2hhbmdlZCwgNSBp
bnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEv
bGliYXZmb3JtYXQvTWFrZWZpbGUgYi9saWJhdmZvcm1hdC9NYWtlZmlsZQ0K
aW5kZXggNTY1NTBkYy4uNDBhZGI1MyAxMDA2NDQNCi0tLSBhL2xpYmF2Zm9y
bWF0L01ha2VmaWxlDQorKysgYi9saWJhdmZvcm1hdC9NYWtlZmlsZQ0KQEAg
LTIyOSwxMSArMjI5LDYgQEAgT0JKUy0kKENPTkZJR19SVFBfTVVYRVIpICAg
ICAgICAgICAgICAgICArPSBydHAubyAgICAgICAgIFwNCiAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ0cGVuY192cDgu
byAgXA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgcnRwZW5jX3hpcGgubyBcDQogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICBhdmMubw0KLU9CSlMtJChDT05GSUdf
UlRTUF9ERU1VWEVSKSAgICAgICAgICAgICAgKz0gcnRzcC5vIGh0dHBhdXRo
Lm8NCi1PQkpTLSQoQ09ORklHX1JUU1BfTVVYRVIpICAgICAgICAgICAgICAg
ICs9IHJ0c3AubyBydHNwZW5jLm8gaHR0cGF1dGgubyBcDQotICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBydHBlbmNfY2hh
aW4ubw0KLU9CSlMtJChDT05GSUdfU0FQX0RFTVVYRVIpICAgICAgICAgICAg
ICAgKz0gc2FwZGVjLm8NCi1PQkpTLSQoQ09ORklHX1NBUF9NVVhFUikgICAg
ICAgICAgICAgICAgICs9IHNhcGVuYy5vIHJ0cGVuY19jaGFpbi5vDQogT0JK
Uy0kKENPTkZJR19SVFBERUMpICAgICAgICAgICAgICAgICAgICArPSByZHQu
byAgICAgICAgIFwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIHJ0cC5vICAgICAgICAgXA0KICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnRwZGVjLm8gICAgICBc
DQpAQCAtMjQ4LDYgKzI0MywxMSBAQCBPQkpTLSQoQ09ORklHX1JUUERFQykg
ICAgICAgICAgICAgICAgICAgICs9IHJkdC5vICAgICAgICAgXA0KICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnRwZGVj
X3N2cTMubyBcDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICBydHBkZWNfdnA4Lm8gIFwNCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ0cGRlY194aXBoLm8NCitP
QkpTLSQoQ09ORklHX1JUU1BfREVNVVhFUikgICAgICAgICAgICAgICs9IHJ0
c3AubyBodHRwYXV0aC5vDQorT0JKUy0kKENPTkZJR19SVFNQX01VWEVSKSAg
ICAgICAgICAgICAgICArPSBydHNwLm8gcnRzcGVuYy5vIGh0dHBhdXRoLm8g
XA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgcnRwZW5jX2NoYWluLm8NCitPQkpTLSQoQ09ORklHX1NBUF9ERU1VWEVS
KSAgICAgICAgICAgICAgICs9IHNhcGRlYy5vDQorT0JKUy0kKENPTkZJR19T
QVBfTVVYRVIpICAgICAgICAgICAgICAgICArPSBzYXBlbmMubyBydHBlbmNf
Y2hhaW4ubw0KIE9CSlMtJChDT05GSUdfU0RQX0RFTVVYRVIpICAgICAgICAg
ICAgICAgKz0gcnRzcC5vDQogT0JKUy0kKENPTkZJR19TRUdBRklMTV9ERU1V
WEVSKSAgICAgICAgICArPSBzZWdhZmlsbS5vDQogT0JKUy0kKENPTkZJR19T
SE9SVEVOX0RFTVVYRVIpICAgICAgICAgICArPSByYXdkZWMubw0KLS0gDQox
LjcuMy4xDQoNCg==
---1463810048-1189561312-1287479037=:10000--
More information about the ffmpeg-devel
mailing list