From patchwork Tue Aug 23 09:03:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: erkki.seppala.ext@nokia.com X-Patchwork-Id: 264 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp2180780vsd; Tue, 23 Aug 2016 02:07:06 -0700 (PDT) X-Received: by 10.194.127.163 with SMTP id nh3mr21013448wjb.74.1471943225999; Tue, 23 Aug 2016 02:07:05 -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 m20si2149684wjr.109.2016.08.23.02.07.03; Tue, 23 Aug 2016 02:07:05 -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=@nokia.onmicrosoft.com; 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; dmarc=fail (p=NONE dis=NONE) header.from=nokia.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6600689C0D; Tue, 23 Aug 2016 12:05:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10111.outbound.protection.outlook.com [40.107.1.111]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88F55689B0B for ; Tue, 23 Aug 2016 12:04:18 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mVPEur7J/HRMqABxGbD+Q01ZNIRE6wiqwtV1PMT3vtI=; b=bbnqlQICSJtkmYvZwEG0AtdR1PK1lSu/duxUuEiUfooBUuc7TYAULNF3KXPztcuV1F8IZ0/D7+VD55eQ7blwLV1p+IsOgOQ/dTpk0+i5DBDtR1E6JAwxw9s3KxaFXF+IAdRhoNiS8o6VJ6v3yaQTHC5SI/UhBJqqbV+SgXmJmnI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.4) by VI1PR0701MB2544.eurprd07.prod.outlook.com (10.168.139.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9; Tue, 23 Aug 2016 09:04:18 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id 8337A444A00; Tue, 23 Aug 2016 12:04:04 +0300 (EEST) From: To: Date: Tue, 23 Aug 2016 12:03:36 +0300 Message-ID: <1471943019-14136-19-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> References: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.4] X-ClientProxiedBy: HE1PR02CA0062.eurprd02.prod.outlook.com (10.163.170.30) To VI1PR0701MB2544.eurprd07.prod.outlook.com (10.168.139.145) X-MS-Office365-Filtering-Correlation-Id: 141893ef-0321-482b-d8ac-08d3cb3476f3 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 2:6kgCtfmNxthXI6sLcf7PDabaA4xP/bQSTnJmSExvShmKEt05Bm9wvsTLlHPP04IInLPKkVzxvVNhcYqrHG7p8N4fTfRbz8kULosuCharLRR5HT5UINMQjgdjanMk37gPNB9Yk2vw2wGlI2xzPCXLkH8USznRwQPZzD/cvuG3f/kWQlmLvaFAOZMg1hoOCBdd; 3:R/o0YnLmb4F08hpzzmy+lqSrc5bWhmsRJ6SlRzRkLajbwkwMdGZxdxSZnfa9J39rC6EH8OtWcp2eObl++D7XBSf07Z+z7UH0dkx0FllJgTphp1IEPDPjdSxclotdxxbV X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0701MB2544; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 25:Sqmyc+cdRB4uvpPDKNsiMSrHJk0HlbXf/ranzfjS/mzCATTaXEA+lga3TxHzvWCPaYVe1L3bCwL6C6mWp1+9Ip/pF9DUStAr6OaRHQJF3QZnDC9PS/0z1GT/RVfuig3m6ACYFCD5ExyuB0mOwKSRD4H15Q0ULbXkalfM+bd89VRl3YtR0bJ9HXFUrpINzYY/ikXlun9ZF/btHqHJHFHOwHF9006RPLjkCbBEUMR8bm6Z9eI8nMu43jEXHLDqiX584jb0gBGBdkO/ejcOdFLccZ1nz8/bVkqRVv0SvOulEpFc0dI8JIep6pcoFiM0PMLMfjwztACoBWw1MHbpaE97zIQwZHQqAz27sJ042CEl3PpnGCa5CqNcnzd3ui/XMl5dUBGx1rM0wJHznLU3PXyJU+0x9oHUYcdUQmzhhZJoeeOqbYydccV0mcNhkRsM9jgqovsk8gmd2yoLnhUFNrAlpXCXwY5E2P3l95Ski8/0uOYdwGKsR3VpQl2reoqguMlg/AFq0fPBZ7IW85RXMXbeu2IrtMEfQskihSJMF4jR2HbMilBC6TGa1bm8mV3sO269tR5c1nqFMECaDdQxYglwFFEqYCwuFR8bhXLc2zodTOnswcGO/37O2rIJRdeIElfVWDQlgHj6CmwumgQHbpUqXbvL2WNfSdqSIohChn4HogQrt2JGtGIeR0bQTWN+T2cJ; 31:cK4xY29xr7eIsFJS6F9iU39q/GMdJvT2DxZeTooo84FTyUe+bPYK1uc6UsDWIkkhow32pywIF31MLPGclMvslYHhdpuNg+hsgk9h2jdgI20D4ibqUJBhRe0Uqg8LFsGLX1JoZgsKyicazzD7ib5OVjYyySNe7924pmE4UMxSEaOmqYIbAoGdFRsVOTWFv9kbSrgi/JDK3kXYlF9kHYFcWXIgc1bQK8DcTzE9X9OHVpY= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 20:td5HMyjgPh8xwLvK/xQuITyRRjpqscXKxvZDpAP7w9L828vqiEdyLCS08McIqfkjPz/QS43kWF0ZGVt0iWRc2VR/Lu84SUltG1NJXmqB8g3ohDVGrH/pmS3EobpgBQUqNMfhyn+D5/FC+8ynMrQRHU94fNlAMGVbxSRJJzqmguinw5ziEPP2SMjdd8sEWp4dgG9hh+PGqRxVNE6PaXTZKNCRmz7Z2MPC7fWMgLILNWieTnhnPaqW2hmcCXxRgs5/lL5R80VdGpUfHhsaMUzL5C3pY583Qs0+3ULgYmrFxJoxN8SZd0xOtmJ7U0hZBwYsipjYTdRtp+rAXG1rqHGPPPIB+pT2vLy6bFZ8JIAqs56a3dffhLLlkLw606tr5j/marjl6J6calxoSKCa2tsPAhIScVl/MtnnR8qCeesxBLt1RHqx0wWoLpjmef5ki4lpAsKtPfnh1A4zySadDMGUGCz3FA+kBkpn177RaTOO5lvjYcx81yVYBYXEKEJ9cv5P X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:VI1PR0701MB2544; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0701MB2544; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 4:MDyIEyI8w2v1gXWBXNrAaY722hqMRNwbXUtRZTOohYTuH3lA/r+eDbl1emJilMCUbmPpOJwoJuVMrFXtgfiR1CymGrY4GXj9+XATEU2mEK2O5sdVq9VU2XQ1xaK+itEoAC5IN5vgl4FMb4v97aDr75N+uhFL6E+HBg9xumkiHwSeko/eJs8RPrdxt+OVeuR6me4din5Xie4kBZlyKn9yTj0vcF/VlKugrzZa7724hOoPeFTvFyfnC4PABlFMyLH9omoxNTeFzUYYvlQGwYKxI/RJhiFeNa2TLOgt1QThLo4RRljE+gjfiMDcOe7zcZ18FH3dKMsedg9ooZL1RlzMkvOgvcu1LwxLf2hBsVrq3OftuG9ZP0srO5HMyps7R1zcyVZGuFQQM5rqb4pQP4VJTBYPRAUtTvoTZO4ghs9ed56RVinGZoEdOApystORyVOasZ7U9GqAJlAiA5TRTGjmXA== X-Forefront-PRVS: 004395A01C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(106356001)(7736002)(450100001)(305945005)(3846002)(6116002)(586003)(4001430100002)(7846002)(5820100001)(42186005)(45336002)(19580405001)(189998001)(81166006)(107886002)(81156014)(5660300001)(23676002)(50466002)(36756003)(8676002)(110136002)(46386002)(86362001)(86152002)(52956003)(97736004)(19580395003)(50986999)(76176999)(2950100001)(47776003)(50226002)(66066001)(92566002)(68736007)(2906002)(2876002)(105586002)(101416001)(33646002)(229853001)(122856001)(2870700001)(4326007)(90966002)(2351001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0701MB2544; H:erkkise-laptop.vincit.intranet; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtWSTFQUjA3MDFNQjI1NDQ7MjM6TU5JMGdLZllHMWZSM21Hbk1VWDFCZC82?= =?utf-8?B?SWl4ZEJmZlkrWGNMeitKTjBPN3BJaGpDMlp4OWM5YnFsaXUwZlFPY0Y4YzNy?= =?utf-8?B?NDN4N1hBN0ZGL3p4MHJTdkprbm5tejhFVFZ5SjBIOHNLcHVEUjZKcU95SWUr?= =?utf-8?B?Q3VvMGxiOXVjZlh2Z3oxNnNXVE13UjhhS1JXbUhJa1hzNVhhTlcvQnJMTkVa?= =?utf-8?B?YzcxeTVqd1A2MjBWRU16cE5WZHo3eXV4eEtNRnUzRGt2dTdvdnpsN0hOSEVD?= =?utf-8?B?VUE3dUFBUW1LVW5WOXQ4NUV0enVnQUZUZE1uU0VZbXROajczSTVNRVRualJH?= =?utf-8?B?eVhVaU1aQVhBTmhubkt5OEthQ2RQWjFtQVhkc3dBR1R1VWk4VCt6ZlM3SzhE?= =?utf-8?B?OUxyTksydlBnem14RytWaFVpOG8xbXNXTGNUOEFrcnZTek5Ob3BFblkwS0x5?= =?utf-8?B?ME9NRWt0c1RaOFBTQUprOG9pUXMwc1hSU1Z5UW5vKys4UFNPZzdJTDRMRXBG?= =?utf-8?B?YTJpQ0ZUelZlbjArY2lwUFhlUXJ2VWFJVjJqeTdsd0tMSDNZNWkrWThQaXFt?= =?utf-8?B?ayswaGY2L2d0TGN0ZEZ6bEp5MWJuUFY3MkY5V25KYXhNRjVDK2hQdHJLZlA5?= =?utf-8?B?eC9rNWNyNFlFNzRsLzQwWTFlemZJWXErSE5GZzNZY3J4allwYVRmQS8xRlQr?= =?utf-8?B?ZFdNa08zTmhEUEFCUWw5SUtkcnpxUWw3a1oyNGJ4Mm1uMk1BYkk1MzZnTkFH?= =?utf-8?B?TmRXeCtoMS85VjRpaDdmMVlsOXBnZFVsMWErZHlvTE10eEhEOXhab2VFY2hM?= =?utf-8?B?RlhOWTlXQm5HMzhTV2dhejhkZHNZb2pmWE1RWElwejkvQmpicVNjUXhHemZm?= =?utf-8?B?U25nS243bWFlYlpyUlBESWhGd0ZMbUl1blMwT09hSkMybnErK3luYi9BcnFC?= =?utf-8?B?SSt2cTArL2w0V0dFaEZlQWcrdjdOamEwS0ptOHBPUjBOa0NtcmNSdkp1OSt0?= =?utf-8?B?TFNxT0lvRkMvNzV0dVdVdXNkT2N6blpyenRhbEFKbUNKazRidDJwSlNNeEJu?= =?utf-8?B?TmJQeitCZEdYSCt1Yi8xZE44Y0NLSG5yNWg3eDJCYnlsRWtta25XOGE3YU13?= =?utf-8?B?MGRuMVJVdUs2K1p0Z2lYNmpJSFo1bUY1d1hPcWduK0h3WFY4bFdiQkpxVUFM?= =?utf-8?B?RHdNeHIwYVZSQ3JURjBUSktTOWNoYWxmTnB0SDFWUm5Yak5ySURWRFducnhF?= =?utf-8?B?TitoNzJEV24rbEJtOGF3N0FzbnBVNUFIdlpRRFo4UGdOeHJMYkM2SCtyN3VL?= =?utf-8?B?dFVvMWJvUWUwOC9Nbi83SXYzUWVpc05aMTMwbXB2eEFZbHFNaDFhelFGQnJx?= =?utf-8?B?RmpnandiNSt6dnNrdnBpcnFyTEtSL2RhNXFrbnpXZlcyU1JVK29BcWVKbHJN?= =?utf-8?B?cHM0T0lPRlY0OVNWWkpPa1g3NCs4TzEvY25SOC9BYVlBTndCL1pnNkF4VnRO?= =?utf-8?B?MUtzK1lVU3dJc1REdEhjTGJJTXFmRGVyUGtRMnVrK2dCNDRpaHBWSWFPNHIz?= =?utf-8?B?aThGWk8xb1VjZjJyZWw0RmxkYzdBMktndnBOMlZxQnM1T2Z4alBVU0I4V3oz?= =?utf-8?B?b0p6NXdKalVvTTE5Z3RSKzRJWG1oOWlQZGhuS2ZSVHNIMGphMWM2V3VNYnFh?= =?utf-8?B?R1hjTkhHNW9VMHFjcFB6dGw5NW04MmUzK2pnUmRRQ1BrUXhtMEZ0Y3lTeUZR?= =?utf-8?Q?TAmMjbtWLsH1KMnEgvm9TeAESbcYdjVBYnMWKG0=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 6:ZQozAJsTH2ckfDrRg8tSjpNM68Cgk//UsgwUWm/jgdPpf7XF6kSc54NOftlSw8YqU9fl39uX05GpzIn6veEtPPRIyQMf/XeD3UkupwwpwU3cq51pBfysJklXwJzcUmrQhUeCl/lhpGCdCNcdqxLj64RZvTEJNh+m3dHhkhlIuZ+p8qzn0BWwJzdJ3RwbtP66B/7ds+dG78V1LVpYF4L3ra6qg3aF4RHvz1i36RJL4gVdCcO0TKoL6SQWYvL57VSGl1HKsMKGGQJgKmc3DbXZpcul8wsxbs3k8fYNQaD3ZWGmZhFMM/PKNqrDCAmdUfBGCHxE5ZU0UzO7igkD9AKUzA==; 5:eGmPN503ZDSgQgvMmFDNa6RdHo6HNhLGxjvz/ntxfEHk0znHwcpiZXjRTWjf8UW4HvGtQhE4yS7QiKkNVqGlBjxuzgSsDZFVhb97IJXZoc4XXg9LzDPh61xtCEhGaOqLfVh67jiwwsTak6zz3VUrmA==; 24:MctfxCTp5TGEsvyBqsNmNCD0k5R9D1++I3MNe5DLZDhUUQxN+0TJmOqWeTJgkkk8v3H04ey99LMnqN29PHgBhhH24jEAFk3zX3qGTG1Hvr4=; 7:qoRI7w7C5ZI7MVi1ECt+ZMHVEX7Rw+o2NQAfsEHVUQ9ma/L7RbsFjB2K5U5GXzerQn69TP7tVU6xbLoBOR5UGVk+3VZPMcgtUa2mZNlamtkOD/mwSk5yJmLpL7JCpZesSt4wWrZWv1e6QejWbaOVgQR/D3Y9hUlLGkXuQslVOjb+rR1yuNVGRk4jayF1PEZEheD4ehP0lTTUfwF+XvIAy3fyqLkANzaN+VZo7kOrUcVps6O25msoZBjRFFfCLGUV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 09:04:18.3351 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2544 Subject: [FFmpeg-devel] [PATCH 18/21] libavformat/movenc: mov_write_audio_tag writes the proper number of channels, not the hardcoded 2 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: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= , OZOPlayer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Erkki Seppälä Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 94d978b..020d13d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1039,7 +1039,7 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex avio_wb16(pb, 16); avio_wb16(pb, track->audio_vbr ? -2 : 0); /* compression ID */ } else { /* reserved for mp4/3gp */ - avio_wb16(pb, 2); + avio_wb16(pb, track->par->channels); avio_wb16(pb, 16); avio_wb16(pb, 0); }