FFmpeg/libavcodec
Michael Niedermayer 99de3df3d3 Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078':
  avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member

Conflicts:
	libavcodec/libvpxenc.c
	libavcodec/options_table.h
	libavfilter/vf_drawtext.c

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