1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer 7fce8c752d Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
  lavc: do not compile fmtconvert unconditionally

Conflicts:
	configure
	libavcodec/ppc/Makefile
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-01 00:06:42 +01:00
..
2015-02-21 20:41:36 +01:00
2015-02-21 20:38:13 +01:00
2015-02-17 11:27:42 -05:00
2015-02-14 19:45:23 +00:00
2015-02-21 15:50:19 +01:00
2015-02-10 14:20:32 +00:00
2015-02-27 09:30:13 +00:00
2015-02-18 10:21:56 -05:00
2015-02-24 03:15:42 +01:00
2015-02-15 17:28:02 +01:00
2015-02-14 12:48:41 +00:00