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

Merge remote-tracking branch 'qatar/master'


* qatar/master:
  yuv4mpeg: reject unsupported codecs
  nutenc: K&R formatting cosmetics
  assdec: fix qsort() callback signature
  configure: detect sparc64 automatically
  vp8: fix memset() crossing array boundary
  h264: fix invalid pointer arithmetic
  amrwbdec: fix invalid pointer arithmetic

Conflicts:
	libavformat/nutenc.c
	libavformat/yuv4mpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8943ad40 424b1e76
No related branches found
No related tags found
No related merge requests found
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