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:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- configure 6 additions, 3 deletionsconfigure
- libavcodec/amrwbdec.c 10 additions, 11 deletionslibavcodec/amrwbdec.c
- libavcodec/vp8.c 2 additions, 1 deletionlibavcodec/vp8.c
- libavformat/assdec.c 3 additions, 2 deletionslibavformat/assdec.c
- libavformat/nutenc.c 394 additions, 359 deletionslibavformat/nutenc.c
- libavformat/yuv4mpeg.c 2 additions, 3 deletionslibavformat/yuv4mpeg.c
Loading
Please register or sign in to comment