ffmpeg/libavformat
Michael Niedermayer 6716e6892b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: Add ZeroCodec test
  oggparseogm: fix order of arguments of avpriv_set_pts_info().
  pngenc: better upper bound for encoded frame size.
  aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
  aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
  aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
  aiffdec: do not set bit rate if block duration is unknown
  wmall: output packet only if we have decoded some samples

Conflicts:
	libavcodec/pngenc.c
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22 20:59:58 +01:00
..
2012-02-06 20:33:06 +01:00
2012-03-03 04:30:49 +01:00
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-03-13 01:14:04 +01:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2012-03-03 04:30:49 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-03-08 21:31:45 +01:00
2012-03-10 18:01:03 +01:00
2012-02-02 14:31:17 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 11:11:38 +01:00
2011-12-20 22:38:53 +01:00
2012-03-18 15:01:58 -07:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-26 07:30:21 +01:00
2012-03-19 19:02:23 +01:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2011-12-30 20:00:53 +01:00