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, 119 insertions, 119 deletions

diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index 2f556e53d6..cb232ba86e 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -1,119 +1,119 @@
-0bgr                a06d3a7652e4885c65895e0e168aab28
-0rgb                b6b5653d2228cdf2ba3c55a72f2e713f
-abgr                1a147fa04ed70b9a7e67a4c89052f630
-argb                997df0b5c268a0d8f9c611cae4e01e05
-bgr0                218df6dc3eb5094a0c16a8bd18bc3999
-bgr24               d6370f6dc34df2ea66e1718baf74137b
-bgr444be            aba6dfea008ae12c2120a95f54293904
-bgr444le            cfb5401e8f076cc8675e17ed1114a3df
-bgr48be             ab65229b64606f6408cd732b967c0b01
-bgr48le             f1b4e718cadee9bd2978289153ce43de
-bgr4_byte           de96505ef9ad7078f87b4dfdf6fe4b61
-bgr555be            8d5de9e9200d622f27dc73958a85045c
-bgr555le            74eb9837706143a40e26305a16a79369
-bgr565be            13a36d6502be88fc0c2aec05b8d2d501
-bgr565le            ed027571692aecd522aa65a90cc7e09b
-bgr8                71ef789609c746c2e7e4be9dec29062c
-bgra                0364b074268682ea46168742a8239f7d
-bgra64be            f9923238a300b84e69dc980d83306871
-bgra64le            0f1b4be0ec298d5ac1be6876862ff243
-gbrap               412a2449fdfaeb5ebdf5e4196cc7391a
-gbrp                4778f8cc2bdbcd65e272ea1761cdca6d
-gbrp10be            0be11fe4b2324054be6f949e81966691
-gbrp10le            173f89ae58fd4d01d6a365318e4da3b1
-gbrp12be            1f5231ed7e4589a3ec98fa79134bdc6a
-gbrp12le            cc4830a263fecadeea535c4938b5cee1
-gbrp14be            6f5143374536e1cf1595260e91c86b7b
-gbrp14le            937ff1dd9f498b39f9e882316e371fbf
-gbrp9be             c76ab5850c9bc72bbbf36caa6d1c5ac7
-gbrp9le             5ad363dc9570187ad3e3f2344fbb30cf
-gray                2ee2ea2340d0ecf2dfa6f90f87384799
-gray16be            a61507aec1088f5692036e1aabdb4f41
-gray16le            171fbdd46e3737bc865d0185a0006e1c
-monob               309b5785a36bd988d17e15d88f4ffad1
-monow               8809a02bc69b58d1114b09ca79ebffad
-nv12                75e90c54d858b993e99f4ee6d2a2a38f
-nv21                8831a3f411015d45fbc5dd191245ba9c
-pal8                13de2a1c3c80cb64d14e2bc4f6f461d0
-rgb0                992f5ad24802cc255edab45c3084db4a
-rgb24               c71ba90f69f15c8275232bb3f62d0ced
-rgb444be            26eaec65d7efd2b0c9c13b47dfd9b241
-rgb444le            5f29863553107110ea817f52151d77b7
-rgb48be             a3bc81c46c21818a989f23104a599ab0
-rgb48le             e87c661ac49aea1f1e93939802883d92
-rgb4_byte           293b1b84f01efd90bde40cb3faffc127
-rgb555be            5229183fa64d4e5c7e3703d8263ee6ae
-rgb555le            c3e9978cb2a4129a5575935e8cbc433a
-rgb565be            bc123b962629ead1a06af0c18cbb6e5f
-rgb565le            20757fafe4756e62d845b2ab4c0b8f93
-rgb8                e01614f5416dcc8ad365ad7a57afc9fb
-rgba                53796fa4c392a1b2659595b6a284f8c4
-rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
-rgba64le            1b826cc613666f545274e8a7799d69f1
-uyvy422             3f411f947e3ac8f842c88e717d68bd9a
-xyz12be             7fb449368615139d47192c4543b5d125
-xyz12le             bfa1cde86dece70348e48f6293a7c2ef
-yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
-yuv411p             9461b188dab6f8b90d9a27e353a89f58
-yuv420p             61fffd2d8425759a33ae07e718d0242d
-yuv420p10be         2abf90242cb021cb6fcf9f2c3c92f6a7
-yuv420p10le         180b7e4de684c7225d2fb37614f842cb
-yuv420p12be         256c9e6cfc878a8abf681b30777c0620
-yuv420p12le         8dc8b86c4790da3769d4a62e87608623
-yuv420p14be         8d22756c5d2b9e501924c082bfb22a6c
-yuv420p14le         c9da19d4818bcb119ad6481b75778f7e
-yuv420p16be         4ccdcca6dd6a960f9a3333f0aee095bd
-yuv420p16le         9c5847d9b0de258a10ee906dc47e24ea
-yuv420p9be          fa7ad4f73232aac0e35def62af1e2c39
-yuv420p9le          3720ba1786b56c8f4913e67dddebbb07
-yuv422p             eee223e92f1f2e5ad4186b411ebf5816
-yuv422p10be         80fa87750491dcc3e93d175b64835654
-yuv422p10le         e1640cd315bd96c6b59f7753825a7306
-yuv422p12be         5c6d86e919515d1af71f8004a6252f9e
-yuv422p12le         7f331cadb0ab75d07656d29f47bd8bd9
-yuv422p14be         4f4e186ba683b90fe990cccc4db7e521
-yuv422p14le         d78016c9119b1f1d1c922bd5aaf47732
-yuv422p16be         1f3c216927d17966a009a42def124bba
-yuv422p16le         90adbdffaeea9b09398339c8a1322b02
-yuv422p9be          e46446534dd0821029d3b831c9c1d1b0
-yuv422p9le          520e418a2429f7efee511b7fcbf45ab6
-yuv440p             456d83524b299f2fa1bb988e421554d9
-yuv444p             068bc09d282d18c9fa35c2787943fc2a
-yuv444p10be         9f6e1490080a454243daee9229425e1e
-yuv444p10le         cc183e51041351d9ac06c4df6e8ad5f7
-yuv444p12be         34f63ac6a47ac681016105d3bfb3e118
-yuv444p12le         7964701bfe8d718edf97f6e0002935bd
-yuv444p14be         4ad3a9d52fe9c050150c0f7d2f3cf63d
-yuv444p14le         69575e5a94b978f159c4fdb1a61587b0
-yuv444p16be         4000b12fa88ed0feef182da31c7e6b96
-yuv444p16le         96a857dba8dc6792c58daec872825b32
-yuv444p9be          07727e5c9040b7f0a17d591288ac330d
-yuv444p9le          4d12d20a68dc28618594c96c2ade4ff4
-yuva420p            3a8c5c142e051367c196f95696e0e2c3
-yuva420p10be        1b7c5ec6691498e24676ce6ed97f62f8
-yuva420p10le        4c13322bca914df2727da91cca85ca1a
-yuva420p16be        6afcf758f4b66c0b4173c942d42212d7
-yuva420p16le        13e195aa96329eb49921b6f9f07b875c
-yuva420p9be         05a78390de312dfd21ac666a9da05fbd
-yuva420p9le         78f5593bf51a31841ef83df41d0316eb
-yuva422p            45ae66d6f69fd5b77e6831e98d228bf4
-yuva422p10be        18284c58b926fe2389605c692a703145
-yuva422p10le        b934d28b615729a24bebf0381c465e37
-yuva422p16be        c3f7354b6013b43439e02aa02be5fe69
-yuva422p16le        a7ccc43820683ab15061d14cf8efce6c
-yuva422p9be         14c55a16d19499b54b4341f135d3e558
-yuva422p9le         a8bf168e5d2709222192d0aff46b1373
-yuva444p            86b05da54db8c7e8cf5b6638e19c6fc5
-yuva444p10be        8c417158165c00fbd42def60cbc27d69
-yuva444p10le        5f303ef3fb56faed69b4cc1c760ac6ae
-yuva444p16be        52a9591ec0d5059e49b1b2803f8582aa
-yuva444p16le        a9272ac197e4a4195662ce90f533976c
-yuva444p9be         f72f646ef07cdab613420585aba041ac
-yuva444p9le         6d431b0a27bf4f86ea44ef5f14247a01
-yuvj411p            037accc8e48ac9928a580cddf444f129
-yuvj420p            73661456012f20cda81207b14bb0c0a5
-yuvj422p            aa97862b57f47c5a6506156e9aaf129a
-yuvj440p            ff8b9884a49d546b035f5d2ac1e673df
-yuvj444p            b8142888d80b8065c54045839e79b331
-yuyv422             f06a4fbbdb32807d05de825daa2c3a1b
-yvyu422             0a2dff23060639f0907dc6ca9288663c
+0bgr                472463dddb3a267e779267d709e2e9ab
+0rgb                ee27e9e48eed7858fc230b692d797ea3
+abgr                1855119ada84e6bb8f79de7f629460c3
+argb                5aff0cdd5bf267b569edd59a64fddbf6
+bgr0                e9f24d414a025f57ad9d36ddb2a89952
+bgr24               58ed21eef5bf91cb4f35453abc531a93
+bgr444be            5a8bc29b33e98fbbd9d0c586ab441a2a
+bgr444le            a0fec3d857e790b4e5496e12366a22a9
+bgr48be             62afa0bb710cecc6e88f10ad73e01962
+bgr48le             53493b4d7e4f38b38164cf397ea5b955
+bgr4_byte           00f225501827ac036671827cb7b02cdc
+bgr555be            2805b1758d3315616fef02ac6d2b3304
+bgr555le            2edc8cf7efe1377620355da6147adb82
+bgr565be            89b04f731b25eb7b5fb814a941c34db7
+bgr565le            b0d9a0fa48e1314b2f7b37ef2038bf9d
+bgr8                84c88588166904caa3d93958a0f12b76
+bgra                250384e91711cd69cae2fad60b41ee43
+bgra64be            c112c67b87ab6b420ebfd578d0ff52d7
+bgra64le            59fda1baafa6ed5da96c984bf8367f57
+gbrap               f0fbba29cbcdc9e73f851804583edf1b
+gbrp                2dbb1a553c277d949820fedec78322ed
+gbrp10be            d8c827d2ecaef5af22b75860244e1b10
+gbrp10le            309cfd025b1afcea6405b8e3cbd56f27
+gbrp12be            b5903a28415b20be8bbb125da2557f43
+gbrp12le            c1350226ad24e5bc6516378e4d9853e0
+gbrp14be            fb5fd58ea76f56cfa01718cb48f0c4bb
+gbrp14le            ef2ea235c7cd7216b82eec2335094901
+gbrp9be             4f1a677c1e4c34b65d531328a6f3ca27
+gbrp9le             4549b7826bea42207b71b5241af76cc3
+gray                b7140de9f48a80811a42ab1d21f461a0
+gray16be            7b57184564d366c2ea357eb51fffb091
+gray16le            daed34d19baf52bdea5c949d3ca202d2
+monob               d6857d796f9911ec90b14fbc5c0c9807
+monow               70db7c2fa2c7fd622cb94cb00f6c1b53
+nv12                19892e9132362164965dc2ab38b0e8bb
+nv21                2bc539709d0110b6f655623dc1ad5509
+pal8                8c6fdbd012d420c77f622e0621b5f999
+rgb0                81d2c4dc5efca8fdde24afc79d5a05c0
+rgb24               3175c356d1ceee7d4032196a3fdc9c44
+rgb444be            5f113d83e0445aad0fc44cdeb2ad0a6e
+rgb444le            87e05746fcaf59497645f61c2729c981
+rgb48be             1ba2387d9fe190b7a49281f8b6488190
+rgb48le             7d698034106cc6cb09268845b8d6c510
+rgb4_byte           9b67ecb854b6a7c14326caedcf078ed9
+rgb555be            88332e853f0c887a223377f4ff05631d
+rgb555le            8e11703ae35a524379212c848518e804
+rgb565be            71020de407a3aad388237e4b8236ba26
+rgb565le            9a29c6b45c55e5baf8d3efdd240ba5e4
+rgb8                8dec9f040dbe1ac0d84545ab821123e5
+rgba                e13af16a37db01d9b2ff427884178620
+rgba64be            7740ca7e29f25ca7ecc094494c64a7a8
+rgba64le            de66b74c8e2022841a6a5a528d419eba
+uyvy422             59b01804411a3a64545c4eae78c8031c
+xyz12be             6f6462c4ddfbca24277621a5d7de337d
+xyz12le             a3598ee7fe1c2c84ed9895dba807d40b
+yuv410p             5dd9ca4c925907b247b33057f41603b7
+yuv411p             2182ed8ed3529a34073e8cdfd77caf23
+yuv420p             d1e2afaf9ba43bd35df5c0cab8cd25ad
+yuv420p10be         815257df1b23be4cd28d45ac76c7113a
+yuv420p10le         00d4a574d0b41e32a437e85c4cb71ed9
+yuv420p12be         2f620ea62f1db8358e65d08c9e617560
+yuv420p12le         79c2c478b1f421b661a6b206ae1bd05d
+yuv420p14be         f2774ae04a215ba99e98f0850a27d442
+yuv420p14le         d5975be9850390a983d9f77d45b2953f
+yuv420p16be         b8e47d3295bfddfd0b1a425d5434e30a
+yuv420p16le         34a2e643c7bdb55be9b6ef915e86f461
+yuv420p9be          09408245a1274981d57344cc6770c9be
+yuv420p9le          5b5f77ec9a7c1fae979cdc81d3692bf4
+yuv422p             c95267f49141e700cbe69755da3ec058
+yuv422p10be         f8792dfe5ef6c5a604a65a5742e5fed0
+yuv422p10le         e945e9b50bf6f19763f04814df475ed7
+yuv422p12be         21b2ccb7e2876ce52b4ba9a1178cebde
+yuv422p12le         047d2f966e0c29516d803590a206f315
+yuv422p14be         80678fb3f6b01aab2bb3fab0cd682ed8
+yuv422p14le         219ef8eb155dac5a4cd90453f351c7c3
+yuv422p16be         d159228d52a362f536dee8ab52588ff6
+yuv422p16le         252433289c2b1ba012ccd707b7a0dda6
+yuv422p9be          e9bc1c8cafc4b42a932af5f0be8b54e4
+yuv422p9le          d94a9c041f978ab87b900bf7e2477811
+yuv440p             3be574a3a31808b06fd235bb674b63fa
+yuv444p             c459431428d7c3b156292b8126524330
+yuv444p10be         7a21cdf0913ea66b893805677e3354b4
+yuv444p10le         b7b51d29c43cb4955f3f5b88975752e2
+yuv444p12be         17094e8b40e6e53d22d1648d6b4ad568
+yuv444p12le         1df345b0d13c3b8ee5dd393be91659bb
+yuv444p14be         c9db13d72e4f16fcadb6980010daa771
+yuv444p14le         c55f98a5ea080b35daec1253853aa19d
+yuv444p16be         ecb39382001511776f18f19d643d7ff1
+yuv444p16le         632be9dbceed9ec4819407fa4039309c
+yuv444p9be          9db46a47e1b816f67501e87add86040d
+yuv444p9le          f01067104b6137727388bf9c907e687a
+yuva420p            957676586f2503dcab5592e58ff697de
+yuva420p10be        efbbc0d5cce4c2a16eea9ffb1e24c89c
+yuva420p10le        52050eac0020a720b382efe2a71c2b29
+yuva420p16be        3802c5784325342d3652f48e99b875cf
+yuva420p16le        5a9ac5633684d042a52411ad7d88c730
+yuva420p9be         c491fd9f27106488de1b7711b9d33f82
+yuva420p9le         891e201f1d34472bf6718e0cbfd8e217
+yuva422p            4f265a36f30e34bab8b7d95f8759a6d0
+yuva422p10be        b27fda83517a68171b4a27121ce20cce
+yuva422p10le        09547f0ec0315edbc1f387a9dd6bf6e5
+yuva422p16be        8dbbac6ea74723f37a693005f5815d8d
+yuva422p16le        e7b47bf2900fe02a0a6ef9c0b4836dd7
+yuva422p9be         1ef03f513daf4cefc06e8f39d3b3bd00
+yuva422p9le         69ebabd7204b1ee37371f85a4f9c6b98
+yuva444p            805214c750967b1da6b8f5b34a1800b3
+yuva444p10be        72317fba47d84f1b96f902a15228510b
+yuva444p10le        3e5d92b38f671562f8a43f432234b7a8
+yuva444p16be        5b83be718ccdf7fa6d1bb8deaf807fa7
+yuva444p16le        4b0fd42585e501f3362d25c83b7f949e
+yuva444p9be         1d397300044cdceff8c127a6e40be790
+yuva444p9le         1ff56cd557ee19640ba134f36badcb9c
+yuvj411p            c9b9057d8344a04fe7378d512e592c83
+yuvj420p            09f4178d1896f93cc7d0600b52874d47
+yuvj422p            b5a062f6489fe7a640bfb5d5dc7959f6
+yuvj440p            19939815867f54810375ab0c9b86d635
+yuvj444p            7b2a52521cd57fc7f543cbbc67666889
+yuyv422             8c3b22cefcab2ab991a77d9a62b270d4
+yvyu422             e011fcd4f69abd4edb7bea2e57cbdc4c