highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: make -aspect work with -vcodec copy.

Browse Source
This commit is contained in:
Nicolas George
2013-04-09 11:21:47 +02:00
parent b42827ffd9
commit b1cc12d0e3
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

@ -2224,7 +2224,14 @@ static int transcode_init(void)
codec->width = icodec->width;
codec->height = icodec->height;
codec->has_b_frames = icodec->has_b_frames;
if (!codec->sample_aspect_ratio.num) {
if (ost->frame_aspect_ratio.num) { // overridden by the -aspect cli option
codec->sample_aspect_ratio =
ost->st->sample_aspect_ratio =
av_mul_q(ost->frame_aspect_ratio,
(AVRational){ codec->height, codec->width });
av_log(NULL, AV_LOG_WARNING, "Overriding aspect ratio "
"with stream copy may produce invalid files\n");
} else if (!codec->sample_aspect_ratio.num) {
codec->sample_aspect_ratio =
ost->st->sample_aspect_ratio =
ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio :