aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/drawutils.c
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-24 10:51:13 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-24 10:51:13 +0200
commitb1b5ba034f38067949f99b558789d62b2f47e8fe (patch)
treeb9a951c7ef240f0aeb0512a3147d6d30364ca388 /libavfilter/drawutils.c
parentc8c402201ad99b0ea8bfe717fef4621d97b85762 (diff)
parent94d8141c8cd96c176f7d4bdb74a95331ec7db19b (diff)
downloadffmpeg-b1b5ba034f38067949f99b558789d62b2f47e8fe.tar.gz
Merge commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b'
* commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b': mov: Append place name instead of overwriting for loci This commit is a noop, see 1607f774949add9e93bba6f288c9c5bf2c10d880 Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavfilter/drawutils.c')
0 files changed, 0 insertions, 0 deletions