1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavutil
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-07-16 19:30:13 +00:00
2012-08-15 22:32:06 +03:00
2012-08-16 22:04:46 +02:00
2012-08-15 22:32:06 +03:00
2012-05-15 18:08:32 +02:00
2012-08-09 01:44:15 +02:00
2012-08-22 14:29:10 +01:00
2012-06-09 02:51:02 +02:00
2012-07-07 01:41:55 +00:00
2012-07-06 17:08:22 +02:00