aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/jpeg2000.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-04 11:05:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-04 11:05:52 +0100
commit2a7cbc29a8aa0db2bcee95123a83c13d02f0f753 (patch)
tree0abab39ac5ce26e567b57befb4bea6f9aa81112e /libavcodec/jpeg2000.c
parent4eea41cba1e1142060e53da2b2367a351d78c766 (diff)
parentdaa7a1d4431b6acf1f93c4a98b3de123abf4ca18 (diff)
downloadffmpeg-2a7cbc29a8aa0db2bcee95123a83c13d02f0f753.tar.gz
Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'
* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18': pthread_slice: rename ThreadContext -> SliceThreadContext Conflicts: libavcodec/pthread_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
0 files changed, 0 insertions, 0 deletions