FFmpeg/libavcodec
Michael Niedermayer 57d59e82cb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmpproto: Fix assignments in if()
  lavf: Fix assignments in if()
  svq1enc: Fix assignments in if()
  lavc: Fix assignments in if() when calling ff_af_queue_add
  h264: Fix assignments in if()
  truemotion2: cosmetics, reformat

Conflicts:
	libavcodec/svq1enc.c
	libavcodec/truemotion2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 15:53:25 +01:00
..
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2013-01-07 11:43:20 +00:00
2013-01-06 13:31:40 +01:00
2013-01-07 11:43:20 +00:00
2013-01-09 01:08:39 +01:00
2012-12-14 20:58:01 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2012-12-24 04:35:12 +01:00
2012-12-31 19:11:12 +01:00
2012-12-21 00:18:34 +01:00
2012-12-14 01:13:21 +01:00
2013-01-14 13:12:38 +02:00
2012-12-11 20:17:30 +11:00
2013-01-06 16:30:02 +01:00
2012-12-31 00:41:35 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2012-12-12 17:46:05 +01:00
2012-12-18 01:58:17 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2012-12-15 11:46:30 +01:00
2013-01-10 04:57:50 +01:00
2013-01-12 14:06:30 +01:00
2013-01-12 14:06:30 +01:00
2012-12-17 20:37:54 +11:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-14 13:12:49 +02:00
2012-12-21 00:18:34 +01:00
2013-01-14 05:05:39 +01:00
2012-12-21 00:18:34 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2013-01-11 00:58:40 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 13:31:40 +01:00