ffmpeg/libavutil
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-07-11 04:04:29 +02:00
2012-07-16 19:30:13 +00:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-09-15 19:47:10 -04:00
2012-10-01 16:41:37 +02:00
2012-08-15 22:32:06 +03:00
2012-05-15 18:08:32 +02:00
2012-08-09 01:44:15 +02:00
2012-08-22 14:29:10 +01:00
2012-06-09 02:51:02 +02:00
2012-07-07 01:41:55 +00:00
2012-10-01 22:24:17 +02:00
2012-09-10 00:07:26 +01:00
2012-07-06 17:08:22 +02:00