Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Oct 2012 17:43:01 +0000 (19:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Oct 2012 17:48:54 +0000 (19:48 +0200)
commit032ba74ed29e0af77da04d2305b0470cb42b1955
tree45127c399bf7846d057b07d35d02cf3f6a5f8675
parentdd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c
parent7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae
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>
12 files changed:
cmdutils.c
cmdutils.h
configure
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/tiffenc.c
libavformat/nutdec.c
libavutil/arm/asm.S