aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/common.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-14 15:42:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-14 15:43:46 +0100
commita01fe55077d9627519930ad3e18d79a6682f6132 (patch)
treec2b205aa14d0c7e32bb73d5fa6ca3f1511d1680f /libavutil/common.h
parent2f265d9087362c17920e4bce59b21653f3fffbfe (diff)
parentc0dc57f1264dad1e121772d03abdb9e14ed8857f (diff)
downloadffmpeg-a01fe55077d9627519930ad3e18d79a6682f6132.tar.gz
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f': asyncts: merge two conditions x86inc: fully concatenate tokens to fix macro expansion for nasm h264: initialize frame-mt context copies properly Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/common.h')
0 files changed, 0 insertions, 0 deletions