aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/smjpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-28 21:12:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-28 21:12:53 +0200
commit5c4160809698bf3731812d22ca8bf6c3754ff189 (patch)
tree1cae48d668953f21eba981f12a3e706ac17e3ead /libavformat/smjpeg.c
parent7b45790771c0db8b5039ff54ee3cfe68d40e1302 (diff)
parentdd4d709be705edaec0bc35c426bf8434e942b7df (diff)
downloadffmpeg-5c4160809698bf3731812d22ca8bf6c3754ff189.tar.gz
Merge commit 'dd4d709be705edaec0bc35c426bf8434e942b7df'
* commit 'dd4d709be705edaec0bc35c426bf8434e942b7df': x86inc: Clear __SECT__ See: 204b228a1d884343dbd974e6326a06901736b3b4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpeg.c')
0 files changed, 0 insertions, 0 deletions