1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer 1232723741 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacenc: Fix issues with huge values of bit_rate.
  dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
  proresenc: multithreaded quantiser search
  riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
  avconv: only set the "channels" option when it exists for the specified input format
  avplay: update get_buffer to be inline with avconv
  aacdec: More robust output configuration.
  faac: Fix multi-channel ordering
  faac: Add .channel_layouts
  rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
  rtmp: Support 'rtmp_app', an option which overrides the name of application
  avutil: add better documentation for AVSampleFormat

Conflicts:
	libavcodec/aac.h
	libavcodec/aacdec.c
	libavcodec/aacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-18 00:28:06 +02:00
..
2012-03-20 18:46:56 -04:00
2012-03-27 11:58:15 -04:00
2012-04-06 08:32:09 +02:00
2012-03-21 03:03:33 +01:00
2012-04-17 19:36:15 +02:00
2012-04-16 16:27:34 +02:00
2012-04-16 18:36:39 +02:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-03-13 01:14:04 +01:00
2012-04-06 22:37:38 +03:00
2012-04-15 16:06:51 +02:00
2012-04-09 20:55:09 +02:00
2012-03-26 22:22:51 +02:00
2012-04-15 13:26:19 +02:00
2012-03-30 20:10:39 +02:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-04-16 16:46:53 +02:00
2012-04-15 18:21:53 +02:00
2012-04-15 01:08:13 +02:00
2012-03-24 14:54:12 +01:00
2012-04-12 11:36:17 +02:00
2012-04-06 22:37:38 +03:00
2012-03-19 18:46:34 +01:00
2012-04-06 00:53:09 +02:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-03-19 22:37:06 +01:00
2012-03-24 17:48:03 +01:00
2012-04-16 18:36:40 +02:00
2012-04-15 20:20:43 +02:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-04-10 23:37:30 +02:00
2012-03-13 01:14:04 +01:00
2012-04-15 16:06:52 +02:00
2012-03-27 20:08:41 +02:00
2012-03-18 07:45:41 -07:00