generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
35e0496a7b
ffmpeg/libswscale
History
Michael Niedermayer 35e0496a7b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Improve suggested Emacs settings for our coding style.
  utvideo: Remove unused variable 'src_size'
  mov: free memory on header parsing failure
  mov: fix leaking memory with multiple drefs.
  swscale: clip before assigning tables in RGB output functions.
  swscale: fix off-by-one in second coefficient in bilinear filters.

Conflicts:
	libavformat/mov.c
	libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-15 23:31:51 +02:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
colorspace-test.c swscale-test: Drop unused argc and argv arguments from main(). 2012-02-01 14:24:25 +01:00
input.c Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
output.c Merge remote-tracking branch 'qatar/master' 2012-04-15 23:31:51 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-04-04 01:14:45 +02:00
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00