Files
ffmpeg/libavcodec
Michael Niedermayer 8364bde02b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sipr: fall back to setting mode based on bit_rate.

Conflicts:
	libavcodec/sipr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-22 14:04:44 +02:00
..
2012-09-18 15:45:20 +02:00
2012-09-21 01:03:31 +02:00
2012-09-21 01:03:31 +02:00
2012-09-15 04:06:32 +02:00
2012-09-11 07:13:49 +02:00
2012-09-09 13:02:08 +02:00
2012-09-15 22:13:21 +02:00
2012-09-10 21:04:01 +02:00
2012-09-18 17:37:41 +02:00
2012-09-19 11:05:36 -07:00
2012-09-21 01:03:31 +02:00