aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-15 02:52:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-15 02:54:04 +0100
commitcd960c8a4f7cd78e3f7d13f78bdf01a5b8136dff (patch)
treed3853a208906945de903b9f53eaa2f1f8bdf5c12 /ffmpeg.h
parent140dfd14fdab67daf9f067509b09a667cbf788d4 (diff)
parent1e763454322f7fbc7799f6009bf2e11d7a3b9821 (diff)
downloadffmpeg-cd960c8a4f7cd78e3f7d13f78bdf01a5b8136dff.tar.gz
Merge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821'
* commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821': png: improve signature check Conflicts: libavcodec/pngdec.c See: 8a08503b78f59d61cf98b9deb99363e3e07d8599 See: 0a3589bf2f0a23b0eb68664fbb00078abe882a88 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions