aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ffmeta.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 13:49:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 13:49:37 +0100
commit9ba38e62734ed2f8bd092f9eab9e6f1c017ee2e0 (patch)
tree1699e4558d4012b985dccf33734c7855c881d6d4 /libavformat/ffmeta.h
parent9748cac5650a24d5b004a861649ab5a8274d5248 (diff)
parente10659244782b26061e7d52c06437de32a43a7af (diff)
downloadffmpeg-9ba38e62734ed2f8bd092f9eab9e6f1c017ee2e0.tar.gz
Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'
* commit 'e10659244782b26061e7d52c06437de32a43a7af': qtrle: add more checks against pixel_ptr being negative. Conflicts: libavcodec/qtrle.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmeta.h')
0 files changed, 0 insertions, 0 deletions