diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 18:28:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 18:37:05 +0200 |
| commit | d560c61125b3ee0ec8cd2e228f0604b63f85b8b2 (patch) | |
| tree | 7234ace48847d414c1b4a6fa763658574e4e5310 /libswscale/input.c | |
| parent | ba12ba859aabfa7153ba397d869db13acdaba340 (diff) | |
| parent | 6877537ff321136cf78ab03b8b91e6b6f218db5b (diff) | |
| download | ffmpeg-streaming-d560c61125b3ee0ec8cd2e228f0604b63f85b8b2.zip ffmpeg-streaming-d560c61125b3ee0ec8cd2e228f0604b63f85b8b2.tar.gz | |
Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'
* commit '6877537ff321136cf78ab03b8b91e6b6f218db5b':
hmac: add missing version bump and APIChanges entry
Conflicts:
libavutil/version.h
version.h is not changed as the code has been added 2 years ago in FFmpeg
See: 82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale/input.c')
0 files changed, 0 insertions, 0 deletions
