[FFmpeg-cvslog] Merge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 19:41:50 2017 -0300| [950c3fa52097efbfa76b5f7311750fe681df673c] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=950c3fa52097efbfa76b5f7311750fe681df673c
---