aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/lavf/wtv
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-28 00:03:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 00:03:59 +0200
commit48a691630833d6b12905475b6bf39fef285872a9 (patch)
treeaaeb0c4d73c6c0c72606aae3c4a1de62b17dc6e7 /tests/ref/lavf/wtv
parente2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (diff)
parent512f3ffe9b4bb86767c2b1176554407c75fe1a5c (diff)
downloadffmpeg-48a691630833d6b12905475b6bf39fef285872a9.tar.gz
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c': dsputil: Split off HuffYUV encoding bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/huffyuv.h libavcodec/huffyuvenc.c libavcodec/pngenc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/wtv')
0 files changed, 0 insertions, 0 deletions