[FFmpeg-cvslog] Merge commit '9e2af0e9071a1229cfe21efff394691d91f979b2'

[Derek Buitenhuis]

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

Merge commit '9e2af0e9071a1229cfe21efff394691d91f979b2'

* commit '9e2af0e9071a1229cfe21efff394691d91f979b2':
  libx264: Allow Stereo3D monoscopic value

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

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

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

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 5030d65..e547164 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -244,6 +244,11 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame)
         case AV_STEREO3D_FRAMESEQUENCE:
             fpa_type = 5;
             break;
+#if X264_BUILD >= 145
+        case AV_STEREO3D_2D:
+            fpa_type = 6;
+            break;
+#endif
         default:
             fpa_type = -1;
             break;


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