aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/vp9intrapred.asm
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-17 14:40:19 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-17 14:40:53 +0200
commit694f9ab1ef141cf80de8f81db6955a17606182af (patch)
tree8bce92071141b185bcd67abbb0cc1cf9429340b5 /libavcodec/x86/vp9intrapred.asm
parent441d5a7084b56fd9874daede2ef90356b3bf9d16 (diff)
parentf1840b070dd449ad25e1ebbab463f10863a5e0f1 (diff)
downloadffmpeg-694f9ab1ef141cf80de8f81db6955a17606182af.tar.gz
Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'
* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1': Revert "mov: Double-check that alias path is not an absolute path" Conflicts: libavformat/mov.c See: c9c7263e5820c957598643216c42be9b1c4f2d2b Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/x86/vp9intrapred.asm')
0 files changed, 0 insertions, 0 deletions