[FFmpeg-cvslog] Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'

Derek Buitenhuis git at videolan.org
Thu May 12 15:29:43 CEST 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu May 12 14:29:28 2016 +0100| [5b9a4476e3120b17afd97f5f22d967ab3fba7570] | committer: Derek Buitenhuis

Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b9a4476e3120b17afd97f5f22d967ab3fba7570
---

 libavcodec/libx264.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index e547164..449d76d 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);


======================================================================




More information about the ffmpeg-cvslog mailing list