ffmpeg/libavcodec
Michael Niedermayer 6c019f05ed Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'
* commit '718907cd881a0b593264aed059c0e00da13f9e15':
  libtwolame MP2 encoding support

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/libtwolame.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 02:17:56 +02:00
..
2014-04-07 13:02:54 +02:00
2014-04-07 23:50:33 +02:00
2014-02-17 20:50:33 +01:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-03-22 03:12:18 +01:00
2014-02-07 19:32:16 +00:00
2014-04-05 03:32:11 +02:00
2014-04-05 03:32:11 +02:00
2014-04-01 05:18:26 +02:00
2014-02-06 02:51:19 +01:00
2014-04-04 04:00:11 +02:00
2014-03-26 04:20:52 +01:00
2014-03-31 01:11:16 +02:00
2014-04-07 23:50:33 +02:00
2014-04-01 13:43:44 +02:00
2014-01-31 18:34:14 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-03-16 23:29:51 +01:00
2014-01-27 20:36:42 +01:00
2014-04-04 04:00:11 +02:00
2014-03-29 18:13:15 +01:00
2014-03-27 23:57:51 +01:00