]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af00d68 4dbceaa)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 15:10:51 +0000 (17:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 15:10:51 +0000 (17:10 +0200)
commitc607a2cc97808c3213bd3b73aa076d81f5470a60
tree901fda1539f4e7462e147c7b76debb8bf29654bctree | snapshot
parentaf00d68af0f0bb18be0979a274e6e666360130f5commit | diff
parent4dbceaa3a84c577e9d79f8c440ee7c223ac917d6commit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sparc: Eliminate dead code in VIS acceleration macros
  flacdec: drop unnecessary assert
  mjpegdec: properly report unsupported disabled features

Conflicts:
libavcodec/flacdec.c
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c diff1 | diff2 | blob | history
libavcodec/sparc/vis.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.