aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/opt.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-31 13:57:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-10-31 13:57:09 +0100
commit9766d9c9851577d8162d5f006dffc721902a1409 (patch)
tree938847263d4b058201617e0cdc5bd50ed098af7f /libavutil/opt.h
parent264f12342c3e71e4ecc9a2993e656e064f774105 (diff)
parent04581c8c77ce779e4e70684ac45302972766be0f (diff)
downloadffmpeg-9766d9c9851577d8162d5f006dffc721902a1409.tar.gz
Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
* commit '04581c8c77ce779e4e70684ac45302972766be0f': x86: yasm: Use complete source path for macro helper %includes Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
0 files changed, 0 insertions, 0 deletions