diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:34:24 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:34:24 +0000 |
commit | e7b8ec8b6fd85464da473d317593ba061529932c (patch) | |
tree | 6c46410d8346b3590e086abf4d2a0986aa37c923 /libavcodec/x86/h264_weight.asm | |
parent | 04e4166536d3fb51ee9b9361de2a414fa876ab6e (diff) | |
parent | 389b79842c67b1f5730215a752a5f89cb1b8d9a3 (diff) | |
download | ffmpeg-e7b8ec8b6fd85464da473d317593ba061529932c.tar.gz |
Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'
This commit is a no-op.
* commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3':
msvc: Fix libx264 linking
doc: Improve the channelsplit example
configure: Support MSYS2 mingw-w64 64bit
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/x86/h264_weight.asm')
0 files changed, 0 insertions, 0 deletions