aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/swresample_internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-04 22:02:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-04 22:08:59 +0100
commitaeaca3816c2677bfdb16cbc6bc55c259ed5028ff (patch)
treeb3f4e856e626e118c01db5282e47947b97163a05 /libswresample/swresample_internal.h
parentb1f213a83ae8d4fe3fa83a145fdbe6da7fd36a90 (diff)
parent1c736bedd9891501960ebac0f7c05eb60225e947 (diff)
downloadffmpeg-aeaca3816c2677bfdb16cbc6bc55c259ed5028ff.tar.gz
Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'
* commit '1c736bedd9891501960ebac0f7c05eb60225e947': omadec: check GEOB sizes against buffer size Conflicts: libavformat/omadec.c See: e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0 See: 91e72e35141f590c38985ad0ae3453a4e9e86b8a Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample_internal.h')
0 files changed, 0 insertions, 0 deletions