diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-20 08:26:09 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-20 08:26:09 +0100 |
commit | 5d2354327725348f3ffc96be87e66065a92b499f (patch) | |
tree | d829c41c625bd881a7c07e174bc038d44e840c67 /libavcodec/sgienc.c | |
parent | 518961bc99b9eb802c5fa08b068edb9fe96a28be (diff) | |
parent | 24da430324735f95880c4a4a54298dc8023125bb (diff) | |
download | ffmpeg-5d2354327725348f3ffc96be87e66065a92b499f.tar.gz |
Merge commit '24da430324735f95880c4a4a54298dc8023125bb'
* commit '24da430324735f95880c4a4a54298dc8023125bb':
Changelog: mark the release 12 branch
This commit is a noop.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/sgienc.c')
0 files changed, 0 insertions, 0 deletions