• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 032ba74e
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    032ba74e
ffserver.c 155 KB