Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:29:28 +0000 (14:29 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:29:34 +0000 (14:29 +0100)
* commit '5fca95c8e515a5ae542d9626ec088bdfc658450e':
  libx264: Forbid inverted Stereo3D mode

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/libx264.c

Simple merge