From patchwork Fri Oct 28 01:40:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 1210 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp863131vsd; Thu, 27 Oct 2016 18:41:12 -0700 (PDT) X-Received: by 10.28.165.214 with SMTP id o205mr978545wme.38.1477618872457; Thu, 27 Oct 2016 18:41:12 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f8si12289197wjn.53.2016.10.27.18.41.11; Thu, 27 Oct 2016 18:41:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org; dkim=neutral (body hash did not verify) header.i=@overt.org; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B6F0A689F65; Fri, 28 Oct 2016 04:41:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from rs224.mailgun.us (rs224.mailgun.us [209.61.151.224]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 915BF689F42 for ; Fri, 28 Oct 2016 04:40:58 +0300 (EEST) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=overt.org; q=dns/txt; s=k1; t=1477618860; h=Message-Id: Date: Subject: Cc: To: From: Sender; bh=XOhEMKPvDXE8/93ew7nbT3PlE76estoG5Ebt50hM0dQ=; b=kHsM3my8jK9a/Y8TJVbQ8oGn4qZ7TZRl0CzXkTJsXRah/2izZYP5aAVUCD2wpjdpH2WSqUCS ciyEsZ+z6CdQ993UvMixxYzqK5ixCzFDpzz4o/ePrKdrZiaoL4nxGkvSNQpfecmY7jmh3TbT 0cVs5gzPqz/VJ5LYo++pgCsIvjA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=overt.org; s=k1; q=dns; h=Sender: From: To: Cc: Subject: Date: Message-Id; b=i0F+YNN3csNVri/ztF7TkW26/Y2JsbXBClXIh5HwQN1udQteaJRcc3Rwy05C4L6bEUrk2H 8NkoRnyx17W8rGufSeT4TegKM9djzXjv6G+rtF3jkssPU2fl2orpmmaaFBvsj/0ncCU8GQnF Km2y/0KKJdptTBuAxt/7KB8EPM8so= X-Mailgun-Sending-Ip: 209.61.151.224 X-Mailgun-Sid: WyIyM2Q3MCIsICJmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZyIsICI0YTg5NjEiXQ== Received: from mail.overt.org (155.208.178.107.bc.googleusercontent.com [107.178.208.155]) by mxa.mailgun.org with ESMTP id 5812acab.7fa7e03b8730-in6; Fri, 28 Oct 2016 01:40:59 -0000 (UTC) Received: from authenticated-user (mail.overt.org [107.178.208.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 05150600DB; Fri, 28 Oct 2016 01:40:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1477618859; bh=9Uw3jh0+byD1NBjEsa3clERwQELWPH0AEtrob7t4GoE=; h=From:To:Cc:Subject:Date:From; b=qDKxeLBi6eMIYlt3sZXgFNn4UTln65F/P7vQmkBXx+rgJ7lyo8ujvyX1xDWT7RRdb tNTD9eswHY8AHYV/VJTn8w0wWmK2UC5ENbWNL5VKYeUkEnVIRxyo4Td2DqichUyOX2 BzwUaLx3jjaPwQZqRx7NOtcJJiJdriD7vrznAav53mOcqn9Xuc6kGypjHi8pLYtDJL wAuIoXGuTNAR6xY/BDPYSAuugxKxccQV47ZFfmzj4C2ijogEKBifCHSU7SU3asYjhI +zdLK0KbvvrhB9ssmgCU2lK7g0TSZQ0K5lMxA/fYvR5lCHm0JfNgNSZpNiijoINVT1 BYWKwSQxUnLiQ== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Oct 2016 18:40:55 -0700 Message-Id: <20161028014055.31966-1-philipl@overt.org> Subject: [FFmpeg-devel] [PATCH] crystalhd: Reorder mspeg4 decoder after software decoders X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Philip Langdale MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This avoids it getting picked by default, which is generally undesirable and can break test runs. Signed-off-by: Philip Langdale --- libavcodec/allcodecs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b592aa3..594d104 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -261,10 +261,10 @@ void avcodec_register_all(void) REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); REGISTER_DECODER(MSA1, msa1); - REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2); REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3); + REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); REGISTER_DECODER(MSRLE, msrle); REGISTER_DECODER(MSS1, mss1); REGISTER_DECODER(MSS2, mss2);