Merge commit '4c0588b4562abad5540f6a5435c62828de9e4fdf'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 04:24:55 +0000 (01:24 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 04:24:55 +0000 (01:24 -0300)
commit700da852b58bf3354dec6652dc1500192ef63154
tree63e0cdf7aba0a7051efe6bd6fdd164b313a53be9
parent53fc4310f1ba74cd6f264f7263359440a2e5646a
parent4c0588b4562abad5540f6a5435c62828de9e4fdf
Merge commit '4c0588b4562abad5540f6a5435c62828de9e4fdf'

* commit '4c0588b4562abad5540f6a5435c62828de9e4fdf':
  mpeg2enc: Don't mark all streams as component video

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/mpeg12enc.c