virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
d5f65e9d40
FFmpeg/libswscale
History
Michael Niedermayer d5f65e9d40 Merge commit '124134e42455763b28cc346fed1d07017a76e84e' 
* commit '124134e42455763b28cc346fed1d07017a76e84e':
  avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Conflicts:
	libavcodec/aacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/options_table.h
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/af_amix.c
	libavfilter/vf_drawtext.c
	libavformat/movenc.c
	libavformat/options_table.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 13:58:11 +02:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
x86 Remove redundant masks in STORE_BGR24_MMX. 2012-09-02 21:56:50 +02:00
colorspace-test.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
input.c swscale/input: silence warnings about incompatible pointer types 2012-07-19 15:49:21 +00:00
libswscale.v
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
options.c Merge commit '124134e42455763b28cc346fed1d07017a76e84e' 2012-09-05 13:58:11 +02:00
output.c Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rgb2rgb_template.c
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rgb2rgb.h swscale: unscaled rgba64->rgb48 2012-07-19 00:17:16 +00:00
swscale_internal.h swscale: fix usePal() 2012-08-30 13:37:03 +02:00
swscale_unscaled.c Optimized unscaled yuvp9/yuvp10 -> yuvp16 conversion. 2012-08-12 23:23:19 +02:00
swscale-test.c
swscale.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
yuv2rgb.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00