diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:29:04 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:29:09 +0100 |
| commit | e3cfd1b2751506dfa5de51a30a19db10eda060f3 (patch) | |
| tree | da4a99ee5540f0ae13ea81499493307e09a6d334 /libavcodec/libx264.c | |
| parent | d4acf9f2dd2aba8fa84ad58df0abf5c9353b4f6a (diff) | |
| parent | 9e2af0e9071a1229cfe21efff394691d91f979b2 (diff) | |
| download | ffmpeg-e3cfd1b2751506dfa5de51a30a19db10eda060f3.tar.gz | |
Merge commit '9e2af0e9071a1229cfe21efff394691d91f979b2'
* commit '9e2af0e9071a1229cfe21efff394691d91f979b2':
libx264: Allow Stereo3D monoscopic value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 5030d65f79..e547164743 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; |