1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer de2cfb744a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pcmenc: set correct bitrate value
  avprobe: don't print format entry name when only one was requested

Conflicts:
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 23:45:00 +02:00
..
2012-04-22 22:26:55 +02:00
2012-05-07 18:56:06 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-05-08 00:25:25 +02:00
2012-04-21 19:28:35 +02:00
2012-05-08 23:18:48 +02:00
2012-05-07 18:55:44 +02:00
2012-05-11 03:33:59 +02:00
2012-04-22 22:26:55 +02:00
2012-04-06 22:37:38 +03:00
2012-05-04 18:50:59 +02:00
2012-05-08 08:49:36 +02:00
2012-05-08 22:04:01 +02:00
2012-04-22 17:27:54 +02:00
2012-05-08 08:39:37 +02:00
2012-04-23 21:59:34 +02:00
2012-04-15 13:26:19 +02:00
2012-03-30 20:10:39 +02:00
2012-05-03 19:37:14 +02:00
2012-04-22 22:26:55 +02:00
2012-05-09 11:58:08 +02: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-27 19:39:19 +02:00
2012-04-22 22:26:55 +02:00
2012-05-13 11:25:24 +02:00
2012-05-08 03:13:37 +02:00
2012-04-22 22:26:55 +02:00
2012-05-07 20:08:56 +02:00
2012-04-12 11:36:17 +02:00
2012-05-05 02:12:40 +02:00
2012-04-06 22:37:38 +03:00
2012-05-08 10:37:13 +02:00
2012-05-08 20:18:53 +02:00
2012-05-12 03:36:17 +02:00
2012-03-24 17:48:03 +01:00
2012-04-22 22:26:55 +02:00
2012-04-16 18:36:40 +02:00
2012-05-08 11:02:12 +02:00
2012-04-15 20:20:43 +02:00
2012-05-12 10:58:08 +02:00
2012-05-10 17:36:49 +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-05-05 02:02:56 +02:00
2012-04-21 18:56:19 +01:00
2012-04-15 16:06:52 +02:00