summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-23 19:41:50 -0300
committerJames Almer <jamrial@gmail.com>2017-03-23 19:41:50 -0300
commit950c3fa52097efbfa76b5f7311750fe681df673c (patch)
treeff02be2dcaa50d702d7f93359b371b5f3bbacd3f /doc/libav-merge.txt
parent40fa9d416a2597b1f8a1b9096bfaf05ad367999c (diff)
parent096a8effa3f8f3455292c958c3ed07e798def7bd (diff)
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>
Diffstat (limited to 'doc/libav-merge.txt')
0 files changed, 0 insertions, 0 deletions