1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavutil
Michael Niedermayer 3630a07513 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libmp3lame: add missing layout terminator
  avconv: multithreaded demuxing.
  Bump lavu minor and add an APIChanges entry for audioconvert functions.
  audioconvert: add a function for extracting the channel with the given index
  audioconvert: add a function for getting the name of a single channel.
  audioconvert: add a function for getting channel's index in layout
  audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
  vf_libopencv: add missing headers.
  iac: add missing dependency

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/libmp3lame.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 21:34:15 +02:00
..
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-04-02 21:23:56 +02:00
2012-05-18 23:34:11 +02:00
2012-04-01 11:01:08 +02:00
2012-05-15 18:08:32 +02:00
2012-05-15 18:08:32 +02:00
2012-06-06 20:01:08 +02:00
2012-06-09 02:51:02 +02:00
2012-06-03 21:57:17 +02:00
2012-04-16 22:13:12 +02:00
2012-06-07 22:13:59 +02:00
2012-06-08 10:42:27 +00:00
2012-02-23 23:44:38 +01:00