Merge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 22:41:50 +0000 (19:41 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 22:41:50 +0000 (19:41 -0300)
commit950c3fa52097efbfa76b5f7311750fe681df673c
treeff02be2dcaa50d702d7f93359b371b5f3bbacd3f
parent40fa9d416a2597b1f8a1b9096bfaf05ad367999c
parent096a8effa3f8f3455292c958c3ed07e798def7bd
Merge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'

* commit '096a8effa3f8f3455292c958c3ed07e798def7bd':
  lavf: check that the codec is supported by extract_extradata

This commit is a noop. The code it changes was reverted.
See 40fa9d416a2597b1f8a1b9096bfaf05ad367999c

Merged-by: James Almer <jamrial@gmail.com>