]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55ed91c 45870f8)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jul 2012 19:58:09 +0000 (21:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jul 2012 20:01:31 +0000 (22:01 +0200)
commit85044358f63f0158fb83712f659f6db5b454a7aa
treea29d74d69c953be07f3049542afb5659c8e87775tree | snapshot
parent55ed91c8565a3c562d2982e1cd5e66df06c6c190commit | diff
parent45870f8b6eb3529992a4315a6957150124d7ca03commit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Print full compiler identification, not only version number
  flacdec: reverse lpc coeff order, simplify filter
  x86: dsputil: drop some unused CPU flag debug code

Conflicts:
cmdutils.c
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c diff1 | diff2 | blob | history
configure diff1 | diff2 | blob | history
ffprobe.c diff1 | | blob | history
libavcodec/flacdec.c diff1 | diff2 | blob | history
libavcodec/flacdsp.c diff1 | diff2 | blob | history
libavcodec/x86/dsputil_mmx.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.