Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 114 insertions, 114 deletions

diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index 495abe9..5ba0b13 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -1,114 +1,114 @@
-0bgr                ba367adf7943b91cf7f98aefe3f7f9ea
-0rgb                c83c555fe20def126bf1b8967442aa97
-abgr                ef31d9057f6e65a7c3308a1b1daa98fa
-argb                5e5e261c4870e0de05d56ff640b9550a
-bgr0                c8729ca08c5d29ecd5ca21c0ea8c54ce
-bgr24               44bec15f35513de7e957b3d59b53cb7b
-bgr444be            d56f795721020fc7a598e3b07f3fba1e
-bgr444le            53224fc7360806c19fbd873e13fd0c68
-bgr48be             0b5ebce3c48eb8614d79e204b5268603
-bgr48le             c4ab61a8b9d502132730c6abb6ffd84c
-bgr4_byte           cab930dbe1fe77d58b41837ecdcb8460
-bgr555be            67162782fdb86813f446d8e1c21c73e9
-bgr555le            85913cfa8dab465f7dcfcfe7f9001a01
-bgr565be            ee9a1debb896d41c53a026f9e6ce006b
-bgr565le            ab7b6055bc3b6b7edc9a5e4de43ec90d
-bgr8                f85ff16e21d922ad6d32648ef3acfbfb
-bgra                9f2e37d73ad3b759fc9d6b12ee668c38
-bgra64be            2f531afc71f6de3efd9aba9f0f0d5bf4
-bgra64le            340a060c3b031c998be480faa3ee1ea3
-gbrap               32c0326859b41ae1fee015648162c6a0
-gbrp                0f59d3a61d391c3dea6f6e5861e9c2f7
-gbrp10be            bc12b34950af11e3f1016acbe2d5dec5
-gbrp10le            0ff56c84154050f992fefc357449da9a
-gbrp12be            b2154eaa6344a37ace82e42b757585e2
-gbrp12le            77956c63e99444fc61c306643acba403
-gbrp14be            3ab29f18610ce10ce2e5c99b1af78415
-gbrp14le            d1465f7280f35aa0a70709e5a7bee1a4
-gbrp9be             f17b7ba66ba35ed0fcbbb5c32c7e0f56
-gbrp9le             fc11219debfbe8dd8c3d6f0ef92c4d50
-gray                6d34024704f862c75db3ba6989a4a039
-gray16be            27cfdb4b211cad34f66a664cabd754b4
-gray16le            91cb081d457100a60c2d0f54110f064f
-nv12                923a313a7013fb0e87608155ef6aa9a4
-nv21                21e6b9273bb74203beabeb9edb9cf95c
-pal8                e1fd50b8a8a67fb5abd8b44abc778bbb
-rgb0                8bd7785a8421b3f60e5eae2d2968a546
-rgb24               d044123f1fe50f656f2101dd3f091ead
-rgb444be            6a076e84d0cdbae2ba29412a28587e81
-rgb444le            f82d127ca2a40ec822171b79a11df65d
-rgb48be             ef5507f88948b54218911d12e1dbef36
-rgb48le             6d045d5990d6ada64a112e3b581a7b38
-rgb4_byte           0f0f9ee31c65dc60da49bf98a1b06dcf
-rgb555be            48fa619bfd04f6dee05416b02605c031
-rgb555le            292cff1f824e49076bad50a07ab1c749
-rgb565be            0dd6f6a5a8713bd1c3d9826bb7a88eab
-rgb565le            6afd85faa8c6f0f330969539178eb9a2
-rgb8                87cf541b110e35a6f9a983e9cde85e15
-rgba                7abe1af7b97f5b9a7aa5ad3e4bf32f76
-rgba64be            2eed28b61af25790c02cc658e5f86b9b
-rgba64le            de8bc34c6d573488d87e87ce8c7ad07f
-xyz12be             c3783bcad9f962049f9992d5c907bbf2
-xyz12le             20a9ebf2256ceda449ba5603f1dab7e3
-yuv410p             126e0da1da4fd89be28087b8367bbb36
-yuv411p             b94f0af107fc4796aca70c0a36d374c5
-yuv420p             74c6b331bd30f005e6c75a192423ad90
-yuv420p10be         1321772e0586e9b89386e792ed9f5277
-yuv420p10le         726b637741fe28c26d57a1dd814ef14b
-yuv420p12be         5c3bf63a61fe41acb958614d4a7c8923
-yuv420p12le         073c6fa32443c1df26243b598fb5a34e
-yuv420p14be         9460b8507137516ae437d00380921cb9
-yuv420p14le         fd162a79436a9585ed44814fa3dc02fd
-yuv420p16be         2d3c84ebff77479e8c5b6e3e59ec4e45
-yuv420p16le         e2c906f2751609bf8cbcbeb2f629319a
-yuv420p9be          d40531645b7ddecf4778f652549c121c
-yuv420p9le          fbffd583dd189a546cf4df144a735f66
-yuv422p             124bc8d668072de1bb3b894cc4bae859
-yuv422p10be         3d6195bb0c4cc9498ef42227839db9d5
-yuv422p10le         d19bdc9ba4e76b38c076ac93e99e6ef4
-yuv422p12be         f2c2f23269fa969e3e3f0ba5e065bc98
-yuv422p12le         6d07ba50dcdaf43bd8b73233ed11e4d9
-yuv422p14be         3115c4c01f6a8b9930b32ec8a12f52ac
-yuv422p14le         00ba7302e4e4db2c70ba0712f2fc8574
-yuv422p16be         3ec47e2709107fcc388b5e0abebf7eaf
-yuv422p16le         a4183a62917bf8568fe11ff446dd18f9
-yuv422p9be          05c2d9a95f329133a9fa03c46eaaf0cd
-yuv422p9le          ea559e7009aef6c36de0daa8061740f7
-yuv440p             15c81c685fa5b9db95150caff14ff83f
-yuv444p             12b752f78af72666627cea2d0c274cdb
-yuv444p10be         6a5d1574657bdadd435c59227b6772d0
-yuv444p10le         cc6e8453e6ffeeca98055722f9833fb0
-yuv444p12be         39086bcf3ad336391c2a378b32d9cd1b
-yuv444p12le         ccc98011edecb7c643e6250c34ae9b3d
-yuv444p14be         b05b5999610b1369d0873212543697f8
-yuv444p14le         a4ae35bb8a377d593635126671d1af30
-yuv444p16be         f2bf0e22a1d184e37eaa199a76cf22ba
-yuv444p16le         c11b151dced5c8854d385373fa4dcc8f
-yuv444p9be          0b4e2a096a7ada2d6fab3f7d5160326c
-yuv444p9le          04b00046c0409849f89bca191298257b
-yuva420p            920c5d1b965eeb72e3a0e343696face3
-yuva420p10be        c2d580dee6da641c176c6357e74d14bd
-yuva420p10le        51781f8328a0ad69466e729cfc31bbc6
-yuva420p16be        1855e36526638e5d364b1d29bd49141b
-yuva420p16le        2476b93493a30cce3c8fe07ea3ce3761
-yuva420p9be         7c9d877f0c06529d60beb5fcbe5a6f47
-yuva420p9le         392387fc9b414576e003abed4f8bf389
-yuva422p            1bc930cf64afc7cc99362fee5d8e08d8
-yuva422p10be        3382c54dd78aec916210edef29aa268f
-yuva422p10le        93862b68e0dc6ea812fa36fbb1641b48
-yuva422p16be        a44509ccee5dd71a67f8138a8dca7620
-yuva422p16le        4a0b4f7cb3fda825acd6eeef7efa4aae
-yuva422p9be         f3d9d423699ccf369b50ea7dfefb16da
-yuva422p9le         f65115fd89e0cbabc975a15e764b4d30
-yuva444p            1cf9c2dddb0e2f082eca981b2226bdb1
-yuva444p10be        e60f55491f67bb69962e4c2a29868da2
-yuva444p10le        6a7a95f6af4ef3ce47e2b20bc2453746
-yuva444p16be        0caa51254006811d244e150fa34f2e90
-yuva444p16le        5f073f7771254bace1d07279c56c9613
-yuva444p9be         3d64778ebee876c77e77066fd57336b9
-yuva444p9le         85a80221022b5de7cb3233845392d8c6
-yuvj411p            55f4d5f22146e7771ec4e5729a438f48
-yuvj420p            f9183e49f42bae31d7d85b92161fa82f
-yuvj422p            aabeed60a6e1b2cf88665ac627bf531f
-yuvj440p            5ae4f404b42f3167f978473d9a3737fc
-yuvj444p            6728997f65b879fd5a3175cb449a8f0c
+0bgr                6d1649ad2ae26bf0aba9802982aa9fa4
+0rgb                1194113a02352ade69914483b73171c1
+abgr                4226b80922dd8a1871774144e0961bd7
+argb                d3036203ab5b21910991e3e3e82b6011
+bgr0                a5bac58d42a5a073cfba3bc37a63c69e
+bgr24               30920f1ba91f0c2578edbc836272aca9
+bgr444be            0befbedfa31ae3003ba94bdd80f0be4a
+bgr444le            5ad2aea0853c0783376e023e28a624ed
+bgr48be             19598875da969bc849ae8c48fd0be124
+bgr48le             2e1391bd193f808618f7874b57da6a9c
+bgr4_byte           13e0c2ef3c77707989f138486d7a88d3
+bgr555be            6c60688404bdd314e62fa5c48d469492
+bgr555le            e69d6f20bb3521ab94480b05195f3467
+bgr565be            03d87555e69e9ec6d056706a32e42cff
+bgr565le            61af6346ff33e7c6e0c18029ee5b13b2
+bgr8                88db3806854e2b6e208bddd3d7c915b2
+bgra                e24cd87914476329d105fde0c0f84c4a
+bgra64be            765282fffb2ff0696e525dbba54ac0be
+bgra64le            ac1a2a1d534b702cd69271107e648dda
+gbrap               cfd372b76ac6baf2641d6de9b4c7f788
+gbrp                ef4e7591b64767afe2ca9b7c301d3122
+gbrp10be            d937410fa29d0ddb2f21f71588cbc43b
+gbrp10le            a0179f87f15ca8717a0f56d13fb56a40
+gbrp12be            977c6f2fba21eefe9a5f5c19e99b5fcb
+gbrp12le            6463ba6908bc3b02fe41b4609c4f1c82
+gbrp14be            40126ec814564dcda8d4f982aa531a4d
+gbrp14le            6063e0bcf763fb12e8a743f9a6601c76
+gbrp9be             2d3cb5e1853159ae378a1d1032100436
+gbrp9le             3367955f3e06f7e86b4e24af959999ea
+gray                3fd917962d5cf01aca9e6e64781a6f63
+gray16be            874ebdc25db148fc77ba5b00ba575f26
+gray16le            3e66fbe2c0f2be343d890df6233f5a37
+nv12                b7ca4a9bcccd23eebffe4047b116abd1
+nv21                6e1d588c8d79d00f9a15ba68f6150421
+pal8                d6ea48d3010c4eb4a7c67e9daafa4510
+rgb0                20c94dbcd811c6272d20ed2705041929
+rgb24               acde67d20ecfd9b821b42a50b9f8d1b3
+rgb444be            0a1aaab8b5e715db00cd68777669614c
+rgb444le            90ffde14e307546bae08e62b32baedbc
+rgb48be             0e75ea2e992dc6922c3264702bc713c8
+rgb48le             2a65f7c6de93f8f3cc4d29ac536d620e
+rgb4_byte           4269ebfe1d5009c4bbc4bfd30de091f9
+rgb555be            c9feb1fb46c8ce76672a916ed64a056a
+rgb555le            be7207fabe29d58ea2ff360b4bef4652
+rgb565be            c8d4e9b4827c094169db7e91149a8fea
+rgb565le            6beede09ee1783731635855e28893b69
+rgb8                bbbf28f35a5ee8a90193bb4af7e1c73f
+rgba                9308b4f0d1b43fbc0aad0e54a4d8abf1
+rgba64be            81d548a6fd8152d155ab9b63f473a8de
+rgba64le            7eec7aca3af6ee25879063d272ae3f55
+xyz12be             8dbd86c5fe699c1e8de57e4938a4f0fb
+xyz12le             1015611cff58af8df19984e576cd5d3e
+yuv410p             4efab910d4c3d093af6da575c8f62eb0
+yuv411p             757b2e4b877ccd3cb92288c63cf490c7
+yuv420p             d4aa824ef1762dadf2bf0200dcb265c9
+yuv420p10be         0d221aeca6c2403a71d23257b10360e8
+yuv420p10le         43efdff30475ebcbc08cafffa4e38f1d
+yuv420p12be         229180cdd8cf48770578e1ffcda527da
+yuv420p12le         87464ed6b01cb83ba7c5135f8d4feb96
+yuv420p14be         41697dd3fcd2dd4a820f207e6c2db982
+yuv420p14le         63b5eca0e5ae2a40af7f92d8f3ab69a4
+yuv420p16be         f2d2949bf0f292c491d62e89788c384c
+yuv420p16le         d3e6f2aad7864a85570d839b1be88035
+yuv420p9be          99b37ae92a24a4fdde77893588e6b5a6
+yuv420p9le          826fdcfe82dc23a40c113d213ae096be
+yuv422p             e71fe145e7d9103b584b78b18008e348
+yuv422p10be         0ca216574f74bcab35577b535ac7b09a
+yuv422p10le         12a998c673345029069b5145c7e819e2
+yuv422p12be         f23acff67c0bf367cc2bc3497cf66ff0
+yuv422p12le         6ed1d6e12b10d1621c0a0884dcecd667
+yuv422p14be         cd589e7350c28d3afd06fe4ad2c9e5db
+yuv422p14le         ef80d04da506ab3e5e4b3dd92816c074
+yuv422p16be         d17095269e535f08443de3a08069cdc6
+yuv422p16le         b6b7034590833818cdc1063abcdca43b
+yuv422p9be          b3f9a98096312a2d93f80c36bc3493f3
+yuv422p9le          cd873cc340348e2b9570142bb4f4bd94
+yuv440p             a54bc3c7aa6c1b154e505673af1d77d8
+yuv444p             6f029e86ef314d266372027e9460216e
+yuv444p10be         65eb2c9d0f49260455380350f1b516f5
+yuv444p10le         ac8c0dea8305be937bf3cd089d6e5ac6
+yuv444p12be         5b5b9734c8886de9c5c8aeaff3afd079
+yuv444p12le         afeee502dfa38da358825e8b9774bcd4
+yuv444p14be         ec7bb5fe8f71702bdaa8f32add890fd4
+yuv444p14le         4db554fe4ed9a6d393a79f57ad2a96d2
+yuv444p16be         f309383c89d05c4e9aeac91a24af256e
+yuv444p16le         45d6ed1b91bb4b8dd652cb8b744accca
+yuv444p9be          d55fd435e91258b312922a2d13ddeacc
+yuv444p9le          f8350f757fb4eb062b23203d440de574
+yuva420p            5b35a2f49d6b0844f3642fef78a41756
+yuva420p10be        a2f254e2af20b999e8f4c8e9f0361a78
+yuva420p10le        8b6998d7f85595b3ee433aa7be9ed01a
+yuva420p16be        2c715c685dc533a023aa1bc65c32677a
+yuva420p16le        eaa62f0823c7d8274d70bb13e9d12c32
+yuva420p9be         4d63658dc6141f389097e1b883016410
+yuva420p9le         7f2fd075ad672cf0a386828f93974fd4
+yuva422p            bc9f7ff5c41280a4269345aa8caaa517
+yuva422p10be        bdc9d71f2e7cbbfa9853d7f8e44c2fc5
+yuva422p10le        dcd7fbe250a387a0047e6441ed8e1f75
+yuva422p16be        fdff763616be48d9a9b25ee8b8a279bb
+yuva422p16le        87da6098b73690d6c7c5beaab642e576
+yuva422p9be         a921cc83d0c44feb980d4b8ad6c470c4
+yuva422p9le         49411e6a8c53faee732d91552262b021
+yuva444p            bd7f207bbbf7fd65ac432d06eac2768f
+yuva444p10be        d6875ae589b8d871a8b5b00917fe8469
+yuva444p10le        e083ed295db926d34e1eb13ec0fac71f
+yuva444p16be        4b5f4a12a84d5ef3d75d6a0bba0e3fe4
+yuva444p16le        e284bf08e6ef6c2f6d1c4c01500307ef
+yuva444p9be         9fdefb50948a09d6e92a36fdf41181ca
+yuva444p9le         818bb81ef12823b171d309d0f6d8c0fc
+yuvj411p            e07dabc33f99ab9e104b52aa7f2a06ec
+yuvj420p            0c62da195c217efa44cee13fc8ed764d
+yuvj422p            127f94dec878594c0915f9ca4d3c56a8
+yuvj440p            52751c606245882a3755aa01795773fa
+yuvj444p            98fadeb89de5c701e7c91098ce05caeb