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

diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index cf0ba72..ff0fa0d 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -1,92 +1,92 @@
-0bgr                a8559fc1395908cda27a27bf79819d61
-0rgb                704924e65927896b84bd645ca59fb7f2
-abgr                f479df06a4b73d348b3af004923d7eb9
-argb                c16c9af56802c3b821b30c613c041622
-bgr0                b7ee10fec20508b64dfca22d61533a88
-bgr24               a1c59acf60652578b802e7f6639d1ac5
-bgr444be            d41639928d05bdee67fa2a76c7f74533
-bgr444le            45f616b1ec9014f8d618878c4db850c1
-bgr48be             7015ba40d142742e5c6a39113fee58af
-bgr48le             fd33d4a60a789d170b871784d0859089
-bgr4_byte           d1ff07684bc1be194d26cdf598385b8e
-bgr555be            2295d642e02f9dcb49c20142bfdd9c1a
-bgr555le            a95883301ab991a3cf8bb063b7912410
-bgr565be            c37ced8fa4951da20831edf9bd46b35c
-bgr565le            da0ee7f773efa07fdacc62b7deac452b
-bgr8                94a043f6d5e01de077a92a9be6f77582
-bgra                02db5e046ced11d3f09d901cae205e2f
-bgra64be            2cac1095d15c99bcde803c06ada336eb
-bgra64le            8b08d4e293c86303245b24881ab3f978
-gbrap               5317a66b677c943203b2a5e93607dc68
-gbrp                b1ffeba90a60e9a23c9f35466c135069
-gbrp10be            07b2842fdf9b92f6cd8e8cf3a8abdfac
-gbrp10le            7fa5429bb4bc6f0e1f3c190bc8064b38
-gbrp12be            5ea6cb457c88b4b3d48f6f63b6208828
-gbrp12le            f969a3b017a0f46008f81453174f4ecd
-gbrp14be            b2879b691564f66b88e63efd268de8c5
-gbrp14le            7baa94cd296e6ec8e41446bca95151e4
-gbrp9be             a6eb7cde03f19a25bf13627d731a2c9a
-gbrp9le             1b6d228b97a370ec76707ed2dcc15a66
-gray                3258910ef8c6f0c4a331368e7af87507
-gray16be            9a4c7e731ce572ad86985b56a653b5c3
-gray16le            d10df57cf0de14206c8e354e8f6b732b
-rgb0                5f8f8076e2b9a2422cac25a4f0459d79
-rgb24               66ca89ced3ade4c239ad6c5a79a6b8cd
-rgb444be            7197a09137ab5630a26226396bb7e313
-rgb444le            2d10d7d2ef4527152a9ba8b2020c8d41
-rgb48be             7aee07b85b137365eb04a7ea4c10dcfe
-rgb48le             debaa00dfed0234efd1441aea8195026
-rgb4_byte           12d6a5a7ca40c531a4d480546ed766eb
-rgb555be            5d36ead35aa8820daab7d84e1ffbb4ac
-rgb555le            10f43b4c9b06742abc114f0ff1864111
-rgb565be            998ca430a1173f194d78a92695e097f9
-rgb565le            99be7760861aa9c1d3d743a1ea311689
-rgb8                6303c75883c1e2e7e13644fb5dcd11a7
-rgba                af33be882959a2fc963d6e5984d24b6d
-rgba64be            9ae73ceaa9d95e7981b4df559b0d3b6d
-rgba64le            86997e62f62d2a5351b5ca9c9c93c2d1
-uyvy422             a07829fe630b59855c80d87d0e8f0dbb
-xyz12be             dcb691784f80fd6b438844e8e30299fd
-xyz12le             c63cdd81442c37d710da95d9be70a24d
-yuv411p             3d3d427999863945aa5ec03edf98c19a
-yuv422p             961d8a22bfe8868eb3c743b4241a3c99
-yuv422p10be         845e80406c880f33a384b5ebdd21796d
-yuv422p10le         0dbf5d1eb94f10cc4413976fa175fa90
-yuv422p12be         9e96f9324d0a4eac4b45161b02c14209
-yuv422p12le         db17368e8cd5409826a088ee26ad2a1b
-yuv422p14be         e20b379fb17e50f279a5ecd9c895537f
-yuv422p14le         9440b0c46dadddc19154054978fce20c
-yuv422p16be         09d09b64aa4b6ae8479a833622bf27e8
-yuv422p16le         03dbbf3394ba66cda54ef53772258dae
-yuv422p9be          7c59e15cb5e6eac9cd090c6ecab4c6b8
-yuv422p9le          98b6b1fbacdfd4c25dbda89b675b660b
-yuv444p             709ffd0e95a9438b14d9ba59c0237a61
-yuv444p10be         5ae7571651faebac6dca2ee4fd24610c
-yuv444p10le         eb3acb92448d8b0e6f145e9d8af43378
-yuv444p12be         df1e9bb90364d874dbac41a8237d6068
-yuv444p12le         7e21d00cb42404df0780317dc135f03d
-yuv444p14be         6abf70b4b7ff55552327230e08e3dd52
-yuv444p14le         85597559a748aa5aeed2d7dc49d7f66e
-yuv444p16be         2a19a8ca44198d0e90c02fd4db24d0c6
-yuv444p16le         5cb12916afef8c82d1796fdc39b97174
-yuv444p9be          fc731b5b0afe0a9de6bd46179c692efa
-yuv444p9le          7449c543e528067afed5d3c96f7b8da2
-yuva422p            d07e0ed0cb20eee67007b154f02cf37c
-yuva422p10be        56bfd0af50b9450f72061c605f6537dd
-yuva422p10le        bfe1df3aae3e02f0a2ddbd404199e6ac
-yuva422p16be        db80a2e1ddc93126206ad4864f67b50c
-yuva422p16le        847e541568b4bce64f916d42173c93c7
-yuva422p9be         5487d986b52f5744a8adac77e46c08f1
-yuva422p9le         6faa61b431b2e0bd4064e5fcecb7130a
-yuva444p            377f65cb10dd8013011e185b6aa66697
-yuva444p10be        5e42b4e4b6b1bfd12aa5869750cd2cce
-yuva444p10le        c1fddd5f488fd4f8d1e07288f8a49182
-yuva444p16be        ba2b267e0cc0c36041f3db4f4072ee9e
-yuva444p16le        c2cfda36aa173be3a4a5c9a8fd66d8db
-yuva444p9be         e047805a8f9552a6e0b6d4f772126808
-yuva444p9le         28336905569a55e935d708527a3c9d9d
-yuvj411p            09f79c56109a13eefb68ee729d9a624b
-yuvj422p            942043a34ac7d0f65edced1f6361259c
-yuvj444p            7e4758df8eb9b18ad60e1b69a913f8c8
-yuyv422             6b0c70d5ebf1685857b65456c547ea1c
-yvyu422             abb45a7331e682d73c5b4e6488cf5ccd
+0bgr                e12778f6c145ad03e44536bb4a858ea7
+0rgb                379ce82e95db49f0713f586c585cc863
+abgr                9d35d1a58b8f9d306a67faea6712bab7
+argb                35e8c6e621f7e8849751b19f4a2fc1b5
+bgr0                8684775720cca9c85e30f2478652597d
+bgr24               763043e2ff7bcbb6c4f7b547807e3829
+bgr444be            52d2d43ded3add0f47070830d00702eb
+bgr444le            7dfcd2a89180cbe3796624a0970b624e
+bgr48be             0efe428e3dc9d34029374116959b9750
+bgr48le             9de58e6bf6416a020205997b8f7ef4c1
+bgr4_byte           7a8b43fc76dc2a1b079d5115c5f072ea
+bgr555be            f9f6d6170232a025bd10fa93e0b32d99
+bgr555le            4492ec3f4d74e9db21ac50473c2f0167
+bgr565be            2642e8da1b5ca85098ffc9a8eb5045db
+bgr565le            7087a6ba7fd4884b4bb53ba7e2a32c98
+bgr8                25b955dd85928ed38dcf83155d87fba1
+bgra                e4d41e237ad493dd4a5f2073c11224c2
+bgra64be            7a7fff4f7414964a6f390c77baa24f25
+bgra64le            269b871157975420c6216a007431522b
+gbrap               81474444d242dcc66c311bec8606865f
+gbrp                be1f1f8d106369db9cf1c0bcc55f16e5
+gbrp10be            419f01e288baa5a49161e3535f00579c
+gbrp10le            9b838ccf9f8cb0ab1286afc98e025996
+gbrp12be            609743b9cc7fe82f260ac955af7447eb
+gbrp12le            a6165d5277da74794fe383d62182ca11
+gbrp14be            580a426febc12f0ef9059485d27c31b4
+gbrp14le            449cb3940a0b4425f762e03dca02cbb7
+gbrp9be             1a31f98919ee0be81e7f82ea05296122
+gbrp9le             cb1bbdd8abde37f09192dbb5be384b75
+gray                7301d87e994c9ccd97be6fbf59e1a5dc
+gray16be            7e615cd3b46ab5ff6cf3b26551d13459
+gray16le            52591058994397e5a159e589f3a6d1c6
+rgb0                7adedf810f211bc2252b5831d0ddaaca
+rgb24               54b70be7f58e7b83c620b59735770e17
+rgb444be            f6ed152b3c752fd0b3e10e02ad9b6730
+rgb444le            5e96e42a4c4aacebffe719bd0c1b95c0
+rgb48be             e77355c323181733db21a8320f99b428
+rgb48le             a4027169c88ef88483afd496443de7d9
+rgb4_byte           efb83aa8379b752a05296cb6d233a9ca
+rgb555be            5810c8cf91b3f56ae3c63ea448a819ba
+rgb555le            008cfc623ca69f2ecd0e1e8a596bc23b
+rgb565be            50e5553479884e67ba491cd0ef437fd8
+rgb565le            f76ee4c40fa86893f22119844b2d9841
+rgb8                2a4c37ea2f220eb18765194423ffe244
+rgba                6fc9697539e311442344a5ef5afb0fbd
+rgba64be            4955caaf73fc31fb5d235d08a3cca701
+rgba64le            00e976463abebb0149f7e17fe7d424f2
+uyvy422             d8e315e78be6357ebebde6f577380227
+xyz12be             a42d19982c231642c7569b1f1d9d3247
+xyz12le             0a5eb51b5d658871705c122256e969d2
+yuv411p             fda3b584d5aa01ed36a72d786e4e8983
+yuv422p             d4968d598f7578484d45f911cf7e77a7
+yuv422p10be         7941f83fa9c929c5f0aae74214ea4e0e
+yuv422p10le         09c7132bd1bb35322198a7dc9076f124
+yuv422p12be         70a0bcf864bc934ae8f7e1cb5af42450
+yuv422p12le         22ff6aee825d133becc58c274a86c29b
+yuv422p14be         b214d20f5b1f0adf2f5ae3c42c296f57
+yuv422p14le         0c1d54cf4270a58f3f71ffb64873fde9
+yuv422p16be         ec5fd765c7bbb25ad6c221571a65eefe
+yuv422p16le         3870f2ef3522f9f90b7ef5e0c9a204d4
+yuv422p9be          ce626720c6c77570c35fe620463ecb4d
+yuv422p9le          00fec58e030fb5a2229fb352351cc3bc
+yuv444p             af40f0cc0405e06acd05f8726d269d98
+yuv444p10be         44b938775a8cee8b477f47f293be4a14
+yuv444p10le         05adcd5f6eb712038bef98d242fe7018
+yuv444p12be         dd67abc58f2c0098900987a26a79b0ef
+yuv444p12le         368890598c5acce63405ce55ec677653
+yuv444p14be         be9e67b0b1a5263bd34522a7ad5ace4a
+yuv444p14le         60cfe5fe38c8b43793a0558d622023ba
+yuv444p16be         6c5eb2062a0b574f8ac7bd4c8a68dfd5
+yuv444p16le         b91694f8a20f63ac643d506b7d56cd19
+yuv444p9be          5d3c04eeaa038d214fff1de4a61fb0c5
+yuv444p9le          f85a5517a90b2a6ffeb9e2da609ed147
+yuva422p            41b54f498eec4b112b048427e5173e9b
+yuva422p10be        a5c2f637daf7765bf47998ed6cdb4daf
+yuva422p10le        06a4a0b5ae7c9cacfce7026ab3f4864a
+yuva422p16be        5936937c90b44a5255379c684839ae06
+yuva422p16le        6a7b7c83fc7bfbbdae7ac691660a95f6
+yuva422p9be         cb01da4076f1f4a9d4e42187e08eca87
+yuva422p9le         5410e56f40e88f6e392aa09602d9ff0d
+yuva444p            e5e44997e8d0d10ad58cdd29ad03bd4d
+yuva444p10be        4c8833db504e73dec1703fe2df170499
+yuva444p10le        7477580a79d967573d493321c33aa9ee
+yuva444p16be        db93cf7c950b14d124dd7bc8c460db10
+yuva444p16le        c63a09efc242f942c06b5a47c22fa2f7
+yuva444p9be         e52fc61c73bbd54ed85001b37edd0ab1
+yuva444p9le         f29d6e729af91d6f73b7325a4b36741c
+yuvj411p            02f96722ae810fec10933e898aaa5562
+yuvj422p            db99669cc79eb8fab44789c1ec01a79b
+yuvj444p            238f3410d044899ecaa4dd5b1798f03b
+yuyv422             4c18970e870f6df41388b7c8cb0620a9
+yvyu422             13eab81a99ab7fa845b077f815a1dc2f