virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '9e2af0e9071a1229cfe21efff394691d91f979b2'

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

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

5
libavcodec/libx264.c
View File

@ -244,6 +244,11 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame)
case AV_STEREO3D_FRAMESEQUENCE: case AV_STEREO3D_FRAMESEQUENCE:
fpa_type = 5; fpa_type = 5;
break; break;
#if X264_BUILD >= 145
case AV_STEREO3D_2D:
fpa_type = 6;
break;
#endif
default: default:
fpa_type = -1; fpa_type = -1;
break; break;