virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'

Browse Source 
* commit '5fca95c8e515a5ae542d9626ec088bdfc658450e':
  libx264: Forbid inverted Stereo3D mode

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-12 14:29:28 +01:00
commit 5b9a4476e3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libx264.c
View File

@ -254,6 +254,13 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame)
break;
}
/* Inverted mode is not supported by x264 */
if (stereo->flags & AV_STEREO3D_FLAG_INVERT) {
av_log(ctx, AV_LOG_WARNING,
"Ignoring unsupported inverted stereo value %d\n", fpa_type);
fpa_type = -1;
}
if (fpa_type != x4->params.i_frame_packing) {
x4->params.i_frame_packing = fpa_type;
x264_encoder_reconfig(x4->enc, &x4->params);