summaryrefslogtreecommitdiffstats
path: root/libavutil/pixelutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2014-08-05 13:22:34 +0200
committerMichael Niedermayer <[email protected]>2014-08-05 13:37:07 +0200
commit9988899993ee6c514749244ff47d43492c42f395 (patch)
treeea289fb93cb930b4934c16daf642f1ed39ddeb64 /libavutil/pixelutils.c
parentbf7ed956ffcd390b3f5ead2b36d47b068f89178f (diff)
parent701e8b42e12ad625c64ceae2252acb1de390278c (diff)
Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'
* commit '701e8b42e12ad625c64ceae2252acb1de390278c': vc-1: Optimise parser (with special attention to ARM) Conflicts: libavcodec/vc1_parser.c See: a0d7f9ec9a10d935b83a47dbcb2cd85dcc007738 Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/pixelutils.c')
0 files changed, 0 insertions, 0 deletions