Merge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 19 Apr 2016 18:17:50 +0000 (19:17 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 19 Apr 2016 18:19:53 +0000 (19:19 +0100)
commite344646c808c4f2d0e9db32c5c1cbedb5871f171
treee574dae6da6e1689c02851309be549ac82b23f3a
parentc54d835e2f185f621ea6cda31a9ef5f83e4a4194
parent564b4591bbe223bdc5f36a1131eaef103f23f5d0
Merge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'

* commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0':
  opt: Add av_opt_copy()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavutil/opt.c
libavutil/version.h