1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 614cf1a613 Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'
* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
  Add a libfdk-aac decoder

Conflicts:
	configure
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21 12:05:19 +02:00
..
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-12 19:40:29 +02:00
2013-08-12 19:40:29 +02:00
2013-08-05 10:14:14 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-17 01:43:30 +02:00
2013-08-20 03:30:36 +02:00
2013-08-20 03:30:36 +02:00
2013-08-20 03:30:36 +02:00
2013-08-07 21:13:12 +02:00
2013-08-05 15:11:17 +02:00
2013-08-12 19:40:29 +02:00
2013-08-13 06:05:44 +02:00
2013-08-09 23:02:48 +02:00
2013-08-12 19:40:29 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 19:29:10 +00:00
2013-08-05 10:15:03 +02:00
2013-08-02 16:45:58 +00:00
2013-08-14 14:04:05 +00:00
2013-08-14 14:04:05 +00:00
2013-08-14 14:04:05 +00:00