aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/oggparseskeleton.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-04 11:14:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-04 11:14:38 +0100
commit3fc26d8073a49c96a0704015ce18f5317d87a739 (patch)
tree54e7c6782281bf070c91faf63371a1980e92da38 /libavformat/oggparseskeleton.c
parent2a7cbc29a8aa0db2bcee95123a83c13d02f0f753 (diff)
parent38ecc3702dabbea09230f6d6333f59e74f5d1c12 (diff)
downloadffmpeg-3fc26d8073a49c96a0704015ce18f5317d87a739.tar.gz
Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'
* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12': pthread: store thread contexts in AVCodecInternal instead of AVCodecContext Conflicts: libavcodec/internal.h libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseskeleton.c')
0 files changed, 0 insertions, 0 deletions