Skip to content
Snippets Groups Projects
Commit f391e405 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'e002e329'


* commit 'e002e329':
  Use the new aes/md5/sha/tree allocation functions
  avutil: Add functions for allocating opaque contexts for algorithms
  svq3: fix pointer type warning
  svq3: replace unsafe pointer casting with intreadwrite macros
  parseutils-test: various cleanups

Conflicts:
	doc/APIchanges
	libavcodec/svq3.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents d6135a88 e002e329
Branches
Tags
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment