[FFmpeg-devel] [ANNOUNCE] ffmpeg-mt merged

[Michael Niedermayer]

On Tue, Mar 22, 2011 at 10:24:43AM +0100, Janne Grunau wrote:
> On Mon, Mar 21, 2011 at 08:56:29PM +0100, Michael Niedermayer wrote:
> > 
> > * merged ffmpeg-mt in
> 
> thanks for ruining the history. see git log --reverse
> 
> > * fixed it to pass fate
> 
> 1/2 of the h264 tests are broken and a couple of others. It might have
> made sense to wait for Alexander and Ronald to fix things really.
> 
> Nice work indeed. Commit quality seems to be on a downwards trend here,
> sorry could not resists.
> 
> Janne
> 
> ps: please make sure that you don't subscribe to any ffmpeg.org
> mailing list. I will remove myself from the videolan repo management.

Please lets all calm down, theres some trash in the merge because it
was in ffmpeg-mt. And its in ffmpeg-mt because the current official
git tree has no common ancestor to what ffmpeg-mt had to use back then

fixing this is not trivial because it would break
everyones ffmpeg-mt checkout.

one workaround is to put the attached file in your local .git/info/
this also fixes git log --reverse
Note, i do not know if this has sideeffects
Note2: yes this works with ffmpeg-mt as well us the main ffmpeg tree

--
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No great genius has ever existed without some touch of madness. -- Aristotle
-------------- next part --------------
435adcd213762869c6a6f806481450216720b364 6ee99a7e13bac17d887c5673040c27b29f2c97cc 6ee99a7e13bac17d887c5673040c27b29f2c97cc
824ee1ac826b89b84cc93fb77f38ec6530909f2b 686ea24614fded4d7501f71901aae61f5160f018 6ee99a7e13bac17d887c5673040c27b29f2c97cc
49652059c673eb977e5b69ffb0c8a543c3210e16 a2efd25ba04e0cb61823cbf765651f437b691b09 b1779800c4f5447891778fe54c5d950dd315d089
f71e7068faabecc32abc798a09b9df403f85e33f 2bbb64dae018cbb09ea47a6bdcb184f551136c26 6cbce6365067e1bdd5127d9001809726ea538e09
c83670eeb613b9509555d4ddcac559a37cc1c5bc 2063f77f904af3544021e16d6da76acf5d9beaed 1c3e117e0bd73ffc5a3abeb35b521fd048988f06
1c187ba01c332b3d99681cfffb90f0247a836303 802206985550e6f685e42595f529133186388acc f3d77632d707ca6497289d5e0b7809b6040e18c8
498ddbb3b2d78819540c1b8fff9a2bc495a33346 aaa05da15fa7710503544d4a94319cb10d49a8f2 00d1e96bf4fc0467744f840fbc85d1a65cbb6f08
4259f9fcf4edc5c92bc02d37d85493b3eb917075 26151296236e0381c1c40e0d97ead8c5ab26b57c 45290fcdf09108121788530c5a0222447a9eac9f
66204771dd8e479d30ef71ad85c162e1a34e4104 3f7521893b9072181763ea176ef8da0c0ad1922a a5cea132023c09f3247046fd5493b707c3e98519
3f7521893b9072181763ea176ef8da0c0ad1922a ed42183540e2a886a7368b8220e0b50aaf363551 e4dccc0d59c934392d88a3c643b13305830f6835
17d7a98c7aadc2be1ceadf875ae2ca71b08a5611 0097d3b01e33d1e0f636a19778a0435a730d4590 1bb56bdb418359b3eb993ff119b02794c6fe605f
0097d3b01e33d1e0f636a19778a0435a730d4590 9e981c8d263986e67de6170895125b1de7e62ddd 2dfa7c72cede04f95c4989099bcebfeeed68455b
0b64ceb6b15560313d0a6ac7cffe9270d7b8e0e8 9ec9f0868de2df3d3448dec887e7440ebb006b27 f240ed18efd80abc6df0bdce13cf0ca708f283ae
8884655418183d2ccde654febc9a88e8398c978a 82324906156d303d5f3b3e10a1855bf05614ebfc 79ec38d1546a7c4573e078c61a15e43bba19b64b
706e94d6531daa0b179613dbef51af8ec5bbe1dd 7e928f69148f6c90d35715f4380accb6fc4e88c4 7c06faf894317d13bafa1e0767bd44dd7701d17e
bb67674aa57e23893f2f19bd4ffb4a92b5a01e83 06ac5ac98dbf03889eb7cccf67fe0cb95615613d cf3b4d9a784982fbd861093c48fe8e924bf88f1e
06ac5ac98dbf03889eb7cccf67fe0cb95615613d febe154099b8f31817e8c047cb3c8dee51b52117 1076b0d093601ac2a0db4a9f2f04bde02c253633
5380fee33a871580fe9f3424767eaf2362c8cde0 ef2d8664f1eff56e969801ecd1c5b7c729902819 30d9331050f51031ce99df3f538f70aa4bf4d7b8
ef2d8664f1eff56e969801ecd1c5b7c729902819 11b1a8ee92128524a3259903c28da54ffd9a60fa 120a083fb7125dbab3fce5b02be89f1b21b1dfdd
83cbbb1a92d58a850d5b254b5f54e78a7bad8ca5 ae7e6bb9708a0f0dac89295c788266e0f15899d2 21ae67900e64e2814d4d581fc56b0345096e445a
210b4a63100e5f4ba5ab23e84460614ca59b7817 fc957c71da6c9a7e5c769e15f256652352f7b4a4 8299a7f81974db82ed7bbe3469c25f386ff4effd
8ae6601b670156b36b227e2a3c0d9cdc72294bd5 c91d7a205df4dd224461b96749b9ce12e2bf6825 e1745e2f6e839a91d5e9347b6dfe7685622b9fb4
c91d7a205df4dd224461b96749b9ce12e2bf6825 4874d258345ec305b0eca78c41491878d42a900d c2341b8596fbd3736a1b21cc0be4ac5997e14b8c
535de6d374ab6b06041f5e3cb392327abd2ce054 6abde3d9e6ccfb062c6f547334171665386b0d85 857c30ecbaebedde2bd8c98d69e257f933f36775
6abde3d9e6ccfb062c6f547334171665386b0d85 d8014c67ff1ef20ca05302dea9e262a3089d996e cb0061d4530858b5715c21da0d6a94a931fb5913
d8014c67ff1ef20ca05302dea9e262a3089d996e 604ee5471f21d310f4014011a20c00c28a31995b 2d23fecd5dfbf544d8ddc0cada2e09d4ddce2a92
604ee5471f21d310f4014011a20c00c28a31995b 379271216e0d522b675e97189ab5d4e5cf7f5f70 9d30e0682a792436e1880fd6ce51966d50ec9c2b
05a3af85edd15fef223f0376d3241cc5c7aa3ed5 8ba50a98f87edb2b87df042f09573ea8be4a8696 3748b2b8e8bcedba2de7fe826c4094169a885840
0be0d5714347f63b0e391ad3e9202f9d5107bb5f f550857de3ffcb6b2980c4c952b7e84db478d399 9b1db5ec99bb2207116844448d5202ce82dcb060
f550857de3ffcb6b2980c4c952b7e84db478d399 d62b7c03b163c3dc067f122ab9fec44de87b37ae 7a5bdd79eb29e91e75b237605747f6df51eb63dd
df444fadf045bf70058da9b074b8f848fc2209b1 14bdf768314413a099fe570891761360733b148c d63a7187646c07619ecb07a3d4bb67c7fba5500d
468eba33060aa87117ac6b617d4eae776951cbf6 3c7a8d94b97003b118c2438343d06ad7cf26198a f9ff7179ff901aa1e2721ff2d13482a792e6e82f
1846cc0549bf3d45fb2a5a2152b7335c794146e8 5323bc6e8adbff2b6849a08e9e071f22241fd807 55347a954ed18799e7db91d8dec5170b1bc58b6d
d4fad7c7f05e6fd7d677eaf1069e04c94b946a0c f3f3d1189de648862ca204676dd7591262f590df 3c8d75e65b526459a86d818ad9f98605a3f48576
91cd95a84759702b85de68047d21a6ef9d32eaca 77f7818ac7b881a5aa024e31147255ed3a413141 7f8c3d1f4d903b3a884175c3da7ffb1e80698d9d
0fb994fbdbf4f985ec9c0d5a681e7a5bf620a765 5eb0c649c780e26a77085bd213f945d88761ad00 bec358d683954738488a7ea529a340e9b11931ef
a564fda546ce3bfd04cf8a0e4ec4fb1b6d40e010 287e761820e85514e00eb6c5958496ecb61825cb 2cf9c7ef9c421835e6b51eb4ef7c488f1feb4bf9
a210b422361b051ba73c115fe6bf65eaa745b19a f9515a4e57356bce4d652451fbaccd071d91dbe9 43a6ca2c3d2fd3ebd262e08b249e57d6f0902aba
f9515a4e57356bce4d652451fbaccd071d91dbe9 a903974adc7c8dd33dfb0acc4e2d6d10c09a23c8 f2b7ce8ae68f9d262ce102605532d3520e279a67
8b7a5375ad0956f546c2b614594b79c3ec54de3d 3ad85b1741ca6d36126bbf674f5b82d550107bae d49dded59122aac162fc3a76bbc2c9b0fb7d32fb
3ad85b1741ca6d36126bbf674f5b82d550107bae ff4c627baab555a4ea6275c919d9f4259adc0e58 70d8c762d9e3045026f1cc7dd95136d894aeced5
73608e1fa14434599aab86d2198a05ec4ca21c59 a5285ae4d452abed92f43e2a7a24dd821343a39c ebd3e99de9d699dd5a79bbe182c10d24f01c90e8
a5285ae4d452abed92f43e2a7a24dd821343a39c a7b8cb3c942fed6c80111519ba5505f11d61f3af d98fe8ecf51ce39de546892ee4c28c548b684965
a7b8cb3c942fed6c80111519ba5505f11d61f3af 17dcbec74c0630e44029dd5e4efd8f9bb2ddee13 29d7eef7dcfaf6cc6c97ac154e54c89f77507d86
9153938f1c1f0933ec59cee14cc26b8f99bd9090 661ca4010c548e135ce1c0c819d0c05a94b66985 a2f4324bb649472b05a2f054c604fbddcc723ee1
51428e56c71512a57f81d85acee3ced7cc0d2983 00425e98fba903dceecb89763b57b8f3b7a1abf3 2483298ae2248cbac39940f2ae85c2b6ddec9282
00425e98fba903dceecb89763b57b8f3b7a1abf3 20997d60c8ec84dd0dd68055901e847c4b4e171a d218a86a0da7b2630828d31393d52295f0e311e9
f7cc4441b7046a542ef655575ce3e8684ff12e02 bba0e098a75f14af80bfd4fdfdf9edcaf8f3fee5 a481293f130e1a70d922beddf3f5401aca2b966a
de736aacd945d66109197a6f04baf915d458f5ac 7eac0bccc22daa54db7c40b530cf692af3f41274 bc7ea1e5cf8ae619feb24e0f0590ba658d55e91b
9ff8764a15cce3fcf3f64270d7d4ec52a3ca7d1a 94985fa9745e2affd0cf3145fa35cb8ae87e7848 135c8c2c16c70dbc899b5e6aacf8991a0986e9e5
521f07e3cf2dfb9b0473027ae2fbb6bd4f203ce4 7d0709ea04d6f2023052506c969d6db9b79f2963 5b3c4c8ac681ae7ccf3c50e8a8b17f0209277456
feca6e0009da2b344b2c1be8f30a55c23623d77e 2485cfd74cf5012fdce8582b7094ddbd09bd70c9 3bf28f9d7fa99bc41f7be5a48c4aa33f3a61d4b9
1878dce0e65b2fab94612c950fac51e3de741636 b7d182610b592eef0714c1d2de18c3233a289b69 86b0e9948b14bcc483e779b092d7a196eea4aa61
2c0e016af759adfdc34a6a1b8592ec0a1ef56da9 d5ea5fc7342e3a1b082659bccd5ffd90a911b780 fc430e8fab5feb13b4e743aa64f30ff440d3e253
c563b57b187279c1af0f723110bdab815fac6385 65e8486a1dd1efbf2750d0bc25c326f8dc836bcd 1b2120c39db33976eaa8ea1abb9fd67a19b00a36
00c4b0bb5a7801d14627015d38762ec314639d3d 63d086d2585d3275a6b9068ee1ca957617ecf902 5cf59463a2a18f630a6d986566ec889bd29924e0
63d086d2585d3275a6b9068ee1ca957617ecf902 314c2b1d2f94be3b6aca3dd1ae0f30c05f10f2ee e10252483e25ab8d5208af56d608c1bd6cd2d06f
314c2b1d2f94be3b6aca3dd1ae0f30c05f10f2ee 9816b66fb55fe03fd6f2a4db9390bdaa59eac697 ef33facdfe6400df858528ef3d196099f4f31c77
9816b66fb55fe03fd6f2a4db9390bdaa59eac697 1292a1840bb5319f1438b63b7be35363ba4fe5b6 4d6f600c58093d64fab0f47f8c52af0f0404ffb8
795b6f2d87b241e98472c8d9771d4327712c6db9 20d6c336b37a7bf7313865a397f19ef33595adf8 1cd11856b0442b5f31f3525981e0f8b0e1476f43
ebce21c15f3aaf1b4512436ed8fc2e71a504bb11 3630d89a7bd6443f9aeda2f6997fb2ea5da5c97d 04824298a9e2fec292cc2859c6a50a5d5a6d7752
4af5480a021156089c193ce2215994cfd170e4e6 2f48eac011767ba2d60329c10a22499c228a31d8 10ac361827dc1f9a2a355f037d40a2912203acd4
822ed86c0ac4de7c38d443e23fcabf1b627118ea e340cacc56545c5fc3a903c68fec99e8921d579e 12e416c848579fc01f859022755b875676c96eda
e044d5c79ab340cf52842ba8452d670959eb37c0 3c3a3648317737830fc863371b455624d093f8e6 d0ee50216d8f33f5c03a856112204cbd66009d92
c2a400d3a5da10f8f2a9c2aa89d9396efe428029 b77accec9077ae8f072091fc7301d661bc9487ba 1e8bd10c579615dde74fe02c797cc4beeeb29ad1
b77accec9077ae8f072091fc7301d661bc9487ba 5d3c2f7512746dd0adf067952ed38d8111d7571d c16184e9baad4e4304d5bfb9340e8b5b6decad65
5d3c2f7512746dd0adf067952ed38d8111d7571d 7041a164baed1c643f0cfa1207fbb2fd06d81f38 647b90ae0e2a972a1cce0a025fd1332c70a2d956
7041a164baed1c643f0cfa1207fbb2fd06d81f38 84cde2e4c7d97f3a9b5f9d4a4c722ccf38c82742 90ffc4902efdb842defa764307fc2cc4eaecb1b7
84cde2e4c7d97f3a9b5f9d4a4c722ccf38c82742 f139f42301a5ee861f1a91cdfcceb2a85349fa29 309d32b0db9e5bfc8109e96fb8e1e20bd51a5d13
f139f42301a5ee861f1a91cdfcceb2a85349fa29 70fb3fdcf2c5f01a555d87f8113efb50286493f7 fabb990ec219d79d356c84cf227c728f9fe68e9e
70fb3fdcf2c5f01a555d87f8113efb50286493f7 1d15df4fd2b4583d56159a7938ef3699c7f46261 45b2b05f8e3842fa626d58226926f561b95749c2
1d15df4fd2b4583d56159a7938ef3699c7f46261 8f759fa0e956f8cc33ccd423cefae23e25c16caf 2f7d6835b6b8767d0931f40590aefb2fd9e78019
8f759fa0e956f8cc33ccd423cefae23e25c16caf 9be00ab6113d71a020eea4fd4483b8483efbb29d 585dac65dba487b764fe136640da3e7573f75151
9be00ab6113d71a020eea4fd4483b8483efbb29d 63f663f09320851b9ed76f489fdab590da2fc7f0 7c96587c17bd35b70b750f0356996528a3cebe62
63f663f09320851b9ed76f489fdab590da2fc7f0 64df3aa6a32a87d96f650b8535c88e1d65b52524 f211662c7c582933cffece04b124431add3938d7
64df3aa6a32a87d96f650b8535c88e1d65b52524 53c86e82af6757c12df3a99aede6862a311f050b d010a2d5befcde4782c4498134bb380e9fb24af6
53c86e82af6757c12df3a99aede6862a311f050b fa8a82e991280b7ccac89ed2a29b332e609bc370 20c9c8eec85c8851d72fd5b6009bec8a180a56d9
cf56bb126e7c056740e51c6c13304b03260b4b47 ccd0d039a3d2fd70a9e947cc2faf79ca091dd687 690bfceb204147d28d8a51b573b518d8e059462d
ccd0d039a3d2fd70a9e947cc2faf79ca091dd687 1cf3ee2d1c13b5c22b471ac7ae08432eb357dd9f
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20110322/a6a9e159/attachment.asc>