Commit 6d49e819 authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg: revert 492cc1

This restores correct block_align values in case of stream copy.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8443082d
...@@ -3076,6 +3076,10 @@ static int transcode_init(void) ...@@ -3076,6 +3076,10 @@ static int transcode_init(void)
codec->frame_size = icodec->frame_size; codec->frame_size = icodec->frame_size;
codec->audio_service_type = icodec->audio_service_type; codec->audio_service_type = icodec->audio_service_type;
codec->block_align = icodec->block_align; 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; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
codec->pix_fmt = icodec->pix_fmt; codec->pix_fmt = icodec->pix_fmt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment