1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavcodec
Michael Niedermayer 4727ec3c0e Merge remote branch 'qatar/master'
* qatar/master:
Not pulled due to wrong author, according to carl:  Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
  Fix compilation of timefilter test program.
  Add support for AMR-WB encoding via libvo-amrwbenc
  Add an AAC encoder by using the libvo-aacenc library
  g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-12 03:48:21 +02:00
..
2011-04-12 02:02:35 +02:00
2011-04-05 02:31:56 +02:00
2011-04-06 02:59:49 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-04-12 03:48:21 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-04-11 23:39:12 +02:00
2011-04-08 02:50:13 +02:00
2011-04-02 18:19:01 +02:00
2011-04-02 19:26:58 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-12 03:48:21 +02:00
2011-03-28 21:50:46 -07:00
2011-04-06 23:21:44 +02:00
2011-04-06 01:09:04 +02:00
2011-04-06 01:09:04 +02:00
2011-04-08 02:50:13 +02:00
2011-04-07 03:32:26 +02:00
2011-04-06 02:59:49 +02:00
2011-04-03 16:40:12 +02:00
2011-04-03 16:40:12 +02:00
2011-03-19 15:24:31 +00:00
2011-03-28 00:16:44 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-12 03:48:21 +02:00
2011-04-11 04:08:08 +02:00
2011-04-11 04:08:08 +02:00
2011-04-11 04:08:08 +02:00