From 492cc1bef3d1b47b576cae8686b196368290ffe6 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 9 Nov 2011 21:16:27 +0100
Subject: [PATCH] avconv: remove some codec-specific hacks

The problem they are supposed to fix is handled in riff.c, so those
hacks are pointless.
---
 avconv.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/avconv.c b/avconv.c
index a381fdb20a6..eb7df9afac4 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2046,10 +2046,6 @@ static int transcode_init(OutputFile *output_files,
                 codec->frame_size = icodec->frame_size;
                 codec->audio_service_type = icodec->audio_service_type;
                 codec->block_align= icodec->block_align;
-                if(codec->block_align == 1 && codec->codec_id == CODEC_ID_MP3)
-                    codec->block_align= 0;
-                if(codec->codec_id == CODEC_ID_AC3)
-                    codec->block_align= 0;
                 break;
             case AVMEDIA_TYPE_VIDEO:
                 codec->pix_fmt = icodec->pix_fmt;
-- 
GitLab