1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
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
..
2011-12-15 18:38:06 +01:00
2012-02-27 00:00:55 +01:00
2012-01-24 16:03:09 +01:00
2012-04-12 09:35:09 +02:00
2012-01-28 11:04:19 +01:00
2012-04-06 08:32:09 +02:00
2012-01-04 13:21:08 +01:00
2012-01-26 21:59:09 +01:00
2012-03-13 01:14:04 +01:00
2012-03-20 11:10:25 +00:00