aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/avf_concat.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-04-17 12:54:46 +0200
committerClément Bœsch <u@pkh.me>2017-04-17 12:54:46 +0200
commit99b35a51ccbe2fc98530e5cf7529e7d377e1165e (patch)
treee409a8ba94968d7ed094c9eb311dc0bfc21b620d /libavfilter/avf_concat.c
parentbb71eb944c7abe4eccb6b21d4771751feca22980 (diff)
parenta6901b9c6bd51396c1159f1a07f9f5042328cda6 (diff)
downloadffmpeg-99b35a51ccbe2fc98530e5cf7529e7d377e1165e.tar.gz
Merge commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6'
* commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6': Drop libxvid rate control support for mpegvideo encoding This commit is a noop, there is no known issue with it. Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/avf_concat.c')
0 files changed, 0 insertions, 0 deletions