1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer eadd4264ee Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
  adpcmenc: Use correct frame_size for Yamaha ADPCM.
  avcodec: add ff_samples_to_time_base() convenience function to internal.h
  adx parser: set duration
  mlp parser: set duration instead of frame_size
  gsm parser: set duration
  mpegaudio parser: set duration instead of frame_size
  (e)ac3 parser: set duration instead of frame_size
  flac parser: set duration instead of frame_size
  avcodec: add duration field to AVCodecParserContext
  avutil: add av_rescale_q_rnd() to allow different rounding
  pnmdec: remove useless .pix_fmts
  libmp3lame: support float and s32 sample formats
  libmp3lame: renaming, rearrangement, alignment, and comments
  libmp3lame: use the LAME default bit rate
  libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
  libmp3lame: cosmetics: remove some pointless comments
  libmp3lame: convert some debugging code to av_dlog()
  libmp3lame: remove outdated comment.
  libmp3lame: do not set coded_frame->key_frame.
  libmp3lame: improve error handling in MP3lame_encode_init()
  ...

Conflicts:
	doc/APIchanges
	libavcodec/libmp3lame.c
	libavcodec/pcxenc.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/sgienc.c
	libavcodec/utils.c
	libavformat/hls.c
	libavutil/avutil.h
	libswscale/x86/swscale_mmx.c

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