Michael Niedermayer
d46c1c72e4
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 14:33:32 +02:00
..
2012-06-20 20:47:46 +02:00
2012-07-23 21:25:09 +02:00
2012-07-23 21:25:09 +02:00
2012-09-02 21:56:50 +02:00
2012-08-29 18:04:34 +02:00
2012-07-19 15:49:21 +00:00
2010-01-16 04:48:55 +00:00
2012-07-04 21:03:28 +02:00
2012-09-05 14:33:32 +02:00
2012-07-23 21:25:09 +02:00
2012-02-23 04:31:55 +01:00
2012-07-23 21:25:09 +02:00
2012-07-19 00:17:16 +00:00
2012-08-30 13:37:03 +02:00
2012-08-12 23:23:19 +02:00
2012-01-14 02:22:09 +01:00
2012-08-31 13:34:32 +02:00
2012-08-16 16:20:30 +02:00
2012-08-31 13:34:32 +02:00
2012-08-04 23:51:43 +02:00
2012-08-29 18:04:34 +02:00