1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 032ba74ed2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: fix Thumb PIC on Apple
  nut: add do {} while (0) to GET_V
  tiffenc: Check av_malloc() results.
  tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
  Use atexit() instead of defining a custom exit_program() interface.
  msvc: Fix detection of VFW & Avisynth required libs

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	ffserver.c
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 19:48:54 +02:00
..
2012-08-09 00:02:05 +00:00
2012-08-15 22:32:06 +03:00
2012-10-01 22:24:17 +02:00
2012-09-21 01:03:31 +02:00
2012-09-29 16:25:29 +02:00
2012-08-14 18:58:49 +02:00
2012-08-07 23:57:21 +02:00
2012-09-30 00:13:54 +02:00
2012-09-25 18:10:11 +02:00
2012-08-27 18:31:21 +02:00
2012-08-25 03:55:50 +02:00
2012-08-15 22:32:06 +03:00
2012-09-04 18:37:54 +03:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-07-19 18:44:46 +02:00
2012-09-30 14:05:04 +00:00
2012-08-13 04:58:15 +02:00
2012-10-01 10:24:28 +02:00
2012-07-22 05:18:01 +02:00
2012-10-02 02:24:55 +02:00
2012-09-26 01:56:01 +02:00
2012-09-03 23:26:14 +02:00
2012-09-03 23:23:40 +02:00
2012-09-15 22:13:21 +02:00
2012-07-29 22:02:46 +02:00
2012-09-23 21:12:23 +02:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-08-15 22:32:06 +03:00
2012-08-12 05:32:07 +02:00
2012-09-03 01:26:57 +02:00
2012-09-18 17:37:41 +02:00
2012-09-19 11:05:36 -07:00
2012-10-01 22:24:17 +02:00
2012-08-18 09:52:15 +02:00
2012-09-30 13:39:38 +00:00
2012-08-28 04:07:53 +02:00
2012-09-23 15:24:08 +02:00