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

Merge commit 'f3298f12'


* commit 'f3298f12':
  Return proper error code after av_log_ask_for_sample()
  configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
  oggdec: check memory allocation

Conflicts:
	configure
	libavcodec/pictordec.c
	libavformat/anm.c
	libavformat/oggdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents c6664242 f3298f12
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment