diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:29:28 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:29:34 +0100 |
| commit | 5b9a4476e3120b17afd97f5f22d967ab3fba7570 (patch) | |
| tree | 6ec431767c39ba18ec93172a9f2d6a572a6c146f /libavcodec/libx264.c | |
| parent | e3cfd1b2751506dfa5de51a30a19db10eda060f3 (diff) | |
| parent | 5fca95c8e515a5ae542d9626ec088bdfc658450e (diff) | |
| download | ffmpeg-5b9a4476e3120b17afd97f5f22d967ab3fba7570.tar.gz | |
Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'
* commit '5fca95c8e515a5ae542d9626ec088bdfc658450e':
libx264: Forbid inverted Stereo3D mode
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e547164743..449d76dd38 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -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); |